Updates by Haddad