changed d2u1 and d1u2 in mapping