Better node swap