Gnuplot changes
Main change (needs reverting)