No longer return aux_dict