Edit ControllerManager

Edit ControllerManager