updating to new data structure