Added /target
Added size checks to swap