First addition to plotting routine