Added all handle back in controller.