New revision with each_with_object. Much better.