based on Gadi's comments