Changed result from rank based to point based