Reorganised to avoid EMF dependency