calc_points() improved...