Updated Metrics to R7, changed graphs slightly