NRM Update - Issue 85