Changes to accomodate new gss data