Updated the tracking code