Updated emulator