Updates to SwapVector