some CM updates