working on cm integration