Final changes to event management