Added auto swap.