Updated tracking script