Added additional swap function call on load