Added changes to plotting