last commit from chn-shu