More elegant odd-even tagging algo
Implemented new point set scheme, to be debugged