reworking metrics a bit