update swapping

 update swapping / collision detection