Updated to metrics rev 7