Improvements that can be done to NPF with reference to WIP code/descriptions:

Add a comment