Slight change in dpm impl
Merge