Applied @nf feedback