EventGenerator updated