NRM Update - Issue 92