updates for better reporting and when adding GSS