Change toPoints/toLines to singular