Rewrote parts of the tracking code