many changes, prepare for 1.2