DM modification to align with R2 DM clean version