Added updated plotter