Improvements to plot 2