khanh and yongs updates
khank and yong's updates