all remaining changes from GGI