change_index() improved.