NRM Update - Issue 91