Re-added Metrics

Hopefully it might actually work this time.