NRM Update - Issue 109

NRM Update - Issue 109