Update to event generation with sanity check