actually optimize the N+1 queries of points(wth??)