Updated tracking code