Updated ma design thesis