Changes to EMF requested by Rob