Updates by AlMaha