add Xiaojing's code