code review...

The fact that it's metrics2 is not good, but there is no good solution for supporting both versions...