changing to new data structures