Took some things away, added a plot...