NRM Update - Issue 107