Improved the NUX context