EHN: improvements from francisco-dlp suggestion