Added the controller block