[7.19 afternoon]  merge with guoguo