NRM Update - Issue 106