Junfeng: little update, using "git diff" for details