With emulator added