Added Emulator stuff