Re-enable cm