DS Changes

Here are my changes.  Please accept these.  However, they will override your changes.