Updated the controller