Plotter updated #2