re #699 - Update to Universal Tracking code
re #699 - Update to Universal Tracking code