Some of the re-working of the emc system