Changed method of index calculation