added most of the metrics