Oh and add metrics back first.