make it all work for CM again