diff --git a/BizHawk.Emulation.Cores/CPUs/MOS 6502X/Execute.cs b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/Execute.cs
index 6868fe7409..e03bdd73fe 100644
--- a/BizHawk.Emulation.Cores/CPUs/MOS 6502X/Execute.cs	
+++ b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/Execute.cs	
@@ -548,40 +548,40 @@ namespace BizHawk.Emulation.Cores.Components.M6502
 		bool booltemp;
 		int tempint;
 		int lo, hi;
-		public Action FetchCallback;
+		public Action<string> TraceCallback;
 
 		void Fetch1()
 		{
+			my_iflag = FlagI;
+			FlagI = iflag_pending;
+			if (!branch_irq_hack)
 			{
-				if (FetchCallback != null)
-					FetchCallback();
-				my_iflag = FlagI;
-				FlagI = iflag_pending;
-				if (!branch_irq_hack)
+				interrupt_pending = false;
+				if (NMI)
 				{
-					interrupt_pending = false;
-					if (NMI)
-					{
-						ea = NMIVector;
-						opcode = VOP_NMI;
-						NMI = false;
-						mi = 0;
-						ExecuteOneRetry();
-						return;
-					}
-					else if (IRQ && !my_iflag)
-					{
-						ea = IRQVector;
-						opcode = VOP_IRQ;
-						mi = 0;
-						ExecuteOneRetry();
-						return;
-					}
+					if (TraceCallback != null)
+						TraceCallback("====NMI====");
+					ea = NMIVector;
+					opcode = VOP_NMI;
+					NMI = false;
+					mi = 0;
+					ExecuteOneRetry();
+					return;
+				}
+				else if (IRQ && !my_iflag)
+				{
+					if (TraceCallback != null)
+						TraceCallback("====IRQ====");
+					ea = IRQVector;
+					opcode = VOP_IRQ;
+					mi = 0;
+					ExecuteOneRetry();
+					return;
 				}
-				Fetch1_Real();
 			}
-
+			Fetch1_Real();
 		}
+
 		void Fetch1_Real()
 		{
 			rdy_freeze = !RDY;
@@ -590,6 +590,8 @@ namespace BizHawk.Emulation.Cores.Components.M6502
 				if (debug) Console.WriteLine(State());
 				branch_irq_hack = false;
 				if (OnExecFetch != null) OnExecFetch(PC);
+				if (TraceCallback != null)
+					TraceCallback(State());
 				opcode = ReadMemory(PC++);
 				mi = -1;
 			}
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Core.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Core.cs
index 9cdda96b17..ac336a09d6 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Core.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Core.cs
@@ -151,13 +151,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 			//cpu = new MOS6502X_CPP((h) => DisposeList.Add(h));
 			//cpu = new MOS6502XDouble((h) => DisposeList.Add(h));
 			cpu.SetCallbacks(ReadMemory, ReadMemory, PeekMemory, WriteMemory, (h) => DisposeList.Add(h));
-			cpu.FetchCallback = () =>
-				{
-					if (CoreComm.Tracer.Enabled)
-					{
-						CoreComm.Tracer.Put(cpu.TraceState());
-					}
-				};
+			cpu.TraceCallback = (s) => { if (CoreComm.Tracer.Enabled) CoreComm.Tracer.Put(s); };
+
 			cpu.BCD_Enabled = false;
 			cpu.OnExecFetch = ExecFetch;
 			ppu = new PPU(this);