[KD]Essential Changes for CMX