NRM Update - Issue 90