Make the simulator more explicit