Major revision to NF