Updated for turn class