Events controller edited
Merged events controller