Changes to PlotTools