Simulator changes