Looking at changes made by huydinh.