changes to data structures in 1.2
manually merge