ADAPT TO GC.com CHANGES