new edit in branch luoran

new edit in branch luoran