updated event stuff