SAMZA-25; adding metrics to everything.