changes to make npfs functional