Some changes to the simulation design