Revert "dor and dod"

This reverts commit 2db28b8b5921e7eda310e123ee8f2840ca870610.
Revert "Revert "dor and dod""

This reverts commit 1b810fd5a5b3b31e261e1c3a07108d081c4a467a.