Updated MDAP to work with Ben's changes