Taking account of the ES new dir