NRM Update - Issue 89