changes for muon emulator