Some temporary changes to plotting and some new simulated data