use new data structure.