Improved switchTurns
Improved switchTurns