added new controller and events