New method to calculate averages for percentages and averages indicators, Done