Update to GMC2