Swapper added