Back to plotting the way it used to

Fixing the plot may be a little bit tougher than I thought.