CST1G and CST2G done after Taylor's commit