updated CFMapping with all CF's except 3 pairs - remaining from mm.