merging new cm stuff