Updated for GS 3.12