updated to work with gs 3.10