Merge Adib Changes