NAPAS 2.0 upgrade