Changes to the controller and router