New feature in ESD #6

The following feature is new for ESD #6: