Improved NAN.