Improve the way we draw the control points