Reverted to nn+ standard nfo processing