Added a better controller.