More changes and call controller events