Changes to how events are proccessed