Modification on the controller