Some suggestions from Adi Shavit: 