Updated call swapping