External swaps working