Initial modification/cleanup NRC -> HEAL