Updating DNP

Update to changes as of 6b32916b324161e50862cb95ae3d48afeabcff44