no more mixing and matching


JYD #160