re-formatted the metric capturing and outputing.