NRM Update - Issue 108