Updated Simulator