Moved logic to Turn
Moved logic to Turn