replaced most of the XXXs
merge