Final update for Simulator