Improve simulation controller