More changes to the controller.