This is the changes to the controller and to the model and simulation classes mentioned in the last commit