Merge Adi's workd