changes from pkhuong