adjusted scripts to work with NAF2.0