Changed Simulator class.
Minor changes in Simulator.