Added suggested change, however it is not completed
commented out change while in development
Merge pull request #2260 from ten24/feature-taxintegration-ds

Feature taxintegration ds