Updates by Majd Maghreb