New feature in ESD #3

There following feature is new for ESD #3: