Mix and Match Working on Edit