update from haidong.