fixing up eventing