Refactor the simulator.