Added tracking events to further work