Reworking EventPerSecond