Changes in the controller