refactored Metrics