Major changes in data structure, part 2