Now correctly calculates proportions