Upgrading to metrics 3