major changes in controller structure and updates