Small changes in the controller