Redid turn logic after refactoration
fixed turn logic