Update for Stage1 Emulator