Changes to plotting
Merge