metrics improvements