Updating to latest gt-8 and gs-22