Added new version of the simulator