modified storage of events.