zhufeng  commit 2