Changes according to Adi's request.