Changes for GS 3.10