Changes to plot2.R