second merge attempt
Merge branch 'newnfr'