update for new metrics2.0 style, which is more loose and forgiving