Updates by DEYAA