The new data structures have been added and the old ones have been commented.