Better waypoint for reach combat and cast instant spell during movement

Better waypoint for reach combat and cast instant spell during movement #25