Initial port to metrics 3