little changes in the controller