Improve the controls for simulation