imporved EDS interface