commit 3 by khanh