Event refactoring again :)