Actually includes metrics. Fixes 1.2