Updating Metrics to R7