addressing more WG feedback