Again event refactoring