refactor elena's analysys on a by-event basis