Added plot2D for surface/contour plots