Update

Update to MDS Class and some reformatting