added metrics back in