AW: patches again