Metric check

@syamp 
another review please