Updates to call swapper

Better node transversal