Changes in controller