Update to GA universal code