Revert "Revert "Revert "--add D"""

This reverts commit 43a2451555a8af839c5a8b3c48dd185e67023166.