Adi's commit