Some changes in controller