CDM now works as-is