Working on the plotting function(s)