Moved where the controller is