add by Yifeng

a few suggestion