Updates by Majd ab shargh