100% sync with CM