changes to controller and new