changes to gss builder