New versions of the plotting functions