NRM Update - Issue 105