Changes to the simulator