Check in latest Simulator Classes and new Controller