More improvements to NAO price changes