correcting old marco references to gsaa