Updated to new ED API