Added option to system emulator as well