Added scope swaps