Added logic for points and ordered by them