swap now works