updated for Nhan