refactored metrics