liuhang commit 2