moving to new data structures