Refactor Turn Changer