Preparing for events
Refactor completed