event reporter
fixing merge conflicts