incorporating the changes in the controller