Upgrade to GA UA code