Basic changes in controller