Changes relating to plotting