Revised event tracking