Swapper

Issue with swapper, changed to sunny's version