Modified Metrics a little.