NRM Update - Issue 110