Updated for G-S 3.10