updated with new GA code