updated event management