Updated ga code