deleted more swapping