Reverted to averaging points when grouping them