improved GA tracking