Fix some things
Add Tuyen's functions

Signed-off-by: tuyetphale993 <tuyetphale993@gmail.com>