nick combined simulation and controller updates