New measures
More changes to compute different metrics