Improved GA tracking