Update to account for new nfo processing system