better turn handling