Now uses Centroid calculation, retained the old calculation