swapping all fixed yay