reverted modified Simulator stuff