MINOR - added event tracking