added some cm stuff

Change-Id: Ifb4ed59c1928f137c5718de47930c19d4acb41a7