Updated Top metric

incorporated comments from earlier pull request. 
@zhenyun, Is this addressed in the latest update?