diff --git a/chip-z80/nodenames.js b/chip-z80/nodenames.js
index 7981949..f41cbd8 100644
--- a/chip-z80/nodenames.js
+++ b/chip-z80/nodenames.js
@@ -20,6 +20,7 @@ ab14: 19,
 ab15: 20,
 _reset: 21,
 _wait: 22,
+wait: 22,
 _int: 23,
 int: 23,
 _irq: 23,
@@ -27,6 +28,7 @@ irq: 23,
 _nmi: 24,
 nmi: 24,
 _busrq: 25,
+busrq: 25,
 _m1: 26,
 _rd: 27,
 _wr: 28,
diff --git a/expertWires.js b/expertWires.js
index 2672dae..a82c9c4 100644
--- a/expertWires.js
+++ b/expertWires.js
@@ -216,6 +216,20 @@ function setupParams(){
 			clockTriggers[value]=[clockTriggers[value],"setLow('so');"].join("");
 		} else if(name=="so1" && parseInt(value)!=NaN){
 			clockTriggers[value]=[clockTriggers[value],"setHigh('so');"].join("");
+		// Some Z80 inputs - we can refactor if this becomes unwieldy
+		} else if(name=="int0" && parseInt(value)!=NaN){
+			clockTriggers[value]=[clockTriggers[value],"setLow('int');"].join("");
+		} else if(name=="int1" && parseInt(value)!=NaN){
+			clockTriggers[value]=[clockTriggers[value],"setHigh('int');"].join("");
+		} else if(name=="wait0" && parseInt(value)!=NaN){
+			clockTriggers[value]=[clockTriggers[value],"setLow('wait');"].join("");
+		} else if(name=="wait1" && parseInt(value)!=NaN){
+			clockTriggers[value]=[clockTriggers[value],"setHigh('wait');"].join("");
+		} else if(name=="busrq0" && parseInt(value)!=NaN){
+			clockTriggers[value]=[clockTriggers[value],"setLow('busrq');"].join("");
+		} else if(name=="busrq1" && parseInt(value)!=NaN){
+			clockTriggers[value]=[clockTriggers[value],"setHigh('busrq');"].join("");
+		//
 		} else if(name=="time" && parseInt(value)!=NaN){
 			eventTime=value;
 		} else if(name=="databus" && parseInt(value)!=NaN){