commit 2 by khanh