NPNF plan revision