Added session swapping