Moved tracking code to script
Moved tracking code to script