more changes and ga code