GHS logic update