Changes to plotting functions