Small changed in controller