HEP-0010: improvements #1