Updated the controller and the app