Improve the controller.