Added full turn handling