EMF handling updated