Last bit of sink/swim logic
Fixed merge conflict