some changes to catch on the data re-write
Refactored MSD