MSD changes pull request.

Creating a pull request to merge these changes in.