Updates to NFP