Updated MDD and Design choices to reflect change in design