transitioning to new data structures