Added swapping
Move to 1.4.0