updates dealing with NAF2.0