Added changes to the controller