Added metrics back in