NFP new model simulation
Updates on NFP new model simulations
Clean utility functions