next iteration - metrics

Change-Id: I042fd71628c468d2424abb1954b5c1ce8b081b46