move extra controller to controller