chuong commit 2