duan's change 1.1
duans block 1.0 submit
zhao