Update, Merged Fadi's code

Manually