Changes on the controller