semi-dirty merge pt2