reverted some data structures