Updated Top metric

incorporated comments from earlier pull request. 
And this?