edits to support NHSMP source conversion