refactor, plotter added