take 2 on bug fix + metrics