Patch In GBT Support