Update to be compatible with gs 3.10