CDCDCH more changes