changes to the controller and view