modified_resultset_to_structure_need_to_test