Change CM stuff to our own