2025: Reimplement for DMR