EMF handling improved