Update to use Universal Tracking