Upgraded to current STS and GGTS