Moved where events are fired