finsihed making changes in controller