have to redo eventid logic