Added the controller and protection