Cleaned up the metrics and added my own metric calculation.