Switch from each_attribute to each