Updates by Moalajah fzc