Add back cm specific stuff 2