Final revisions with all the metrics