Maaaany changes, including each_with_index