done changes
changes in controller and view