Modified Simulator