Merging shafiq into eli