[FIX] Move GA code