* Rework Metric Finish a little