Finish 2 old feature of add chidoan and doanvien