Updating the tracking code properly.

Hopefully this new code will track properly.