Upgraded to metrics 3 final