EMF navigation added