merge liu haiyun's code
merge liu haiyun's code src files