Incorporating more edits of dpp ms from Mark.