NRM Update - Issue 88