Some change in controller