follow up GNB simplification