Several changes and adjustments due NFO scan