add metric_fu and few adjustments