Changes to plotting funcs