more event tracking added