NMFC changes