B58092 round2

Changes made based on feedback of previous pull request for DD modularization