Refactor arc factory
Try another method of arcs