Finishing up metric overhaul.