NAPF update

Issue: