changes made for latest GSS version