some more updates for GTS support