Working on the controller