Small changes in the controller
Small changes in the controller