Upgraded plotter.py