NRM Update - Issue 87