Connection swapping made index based as well