Corrected swap
Corrected swap and rise cursor