Improved Nix mode