Re: Use the new swapvp function