Updates to plotting