Changed the controller