Finalised  plotting with the new system