5.42 Metric Logic Updates

Follow