q&d rework of metrics computation (unfinished)