Swapper upgrade