adjustments for gs 3.10.4