NRM Update - Issue 86