some changes, removing z coordinates