Committing the last of my changes for previous version of DS