Updated to use intersection points.