Changes from Toshe's comments