Emulator design upgrades.