NF comment changes