Some changes to the plot-calls