Making the metrics more consistent #2