Slight changes to plotting