Some changes by require of Mr.Tuan