NOF changes