WG: patches again