Zamir's comment changes