added event tracker implementation