removed last of with_index