diff --git a/openocd/rpi-swd-programming-adapter-interior.png b/openocd/rpi-swd-programming-adapter-interior.png
index 0a04b90e4ae7f16958dfb8e09b18e3aae5f40b48..ec3e9796d1b142f264007444878267d8b2160470 100644
Binary files a/openocd/rpi-swd-programming-adapter-interior.png and b/openocd/rpi-swd-programming-adapter-interior.png differ
diff --git a/openocd/rpi-swd-programming-adapter-layout.png b/openocd/rpi-swd-programming-adapter-layout.png
new file mode 100644
index 0000000000000000000000000000000000000000..4582f1f0cdb2125f31296ce06b2628a09fb877eb
Binary files /dev/null and b/openocd/rpi-swd-programming-adapter-layout.png differ
diff --git a/openocd/rpi-swd-programming-adapter-traces.png b/openocd/rpi-swd-programming-adapter-traces.png
index a7e4c3777a7559edfc1f4bef8ef59a97ee23268e..12d5b609c0b0954027acf18dfd1fc9eb9d5b49a9 100644
Binary files a/openocd/rpi-swd-programming-adapter-traces.png and b/openocd/rpi-swd-programming-adapter-traces.png differ
diff --git a/openocd/rpi-swd-programming-adapter.ko b/openocd/rpi-swd-programming-adapter.ko
index a50caca77d739c90b2a8dd18ff4f12c9ce4007b2..20a6652c5c075554cdb5103941877384a7c3f6ff 100644
--- a/openocd/rpi-swd-programming-adapter.ko
+++ b/openocd/rpi-swd-programming-adapter.ko
@@ -119,12 +119,12 @@ class Header_TC_SWD(Component):
     '''
     _pad_header = chamfered_rectangle(-0.04, 0.04,-0.04, 0.04,.007)
     pins = [
-        Pin( .05,  0.1, _pad_header, ''),
-        Pin( .05,  0.0, _pad_header, ''),
+        Pin( .05,  0.1, _pad_header, 'SWDCLK'),
+        Pin( .05,  0.0, _pad_header, 'SWDIO'),
         Pin( .05, -0.1, _pad_header, 'GND'),
-        Pin(-.05,  0.1, _pad_header, 'SWDIO'),
-        Pin(-.05,  0.0, _pad_header, 'SWDCLK'),
-        Pin(-.05, -0.1, _pad_header, 'nRST'),
+        Pin(-.05,  0.1, _pad_header, ''),
+        Pin(-.05,  0.0, _pad_header, ''),
+        Pin(-.05, -0.1, _pad_header, ''),
     ]
     prefix = 'J'
     vias = [Via(p.x,p.y,circle(0,0,.018)) for p in pins]
@@ -257,12 +257,12 @@ def connectM(pin1,pin2,dx,width=.012):
 rpi = Header_RPi_SWD(.5*width,.35,90,'rpi')
 pcb += rpi
 
-tc = Header_TC_SWD(rpi.x+.05,rpi.y-.21,90,'tc')
+tc = Header_TC_SWD(rpi.x-.02,rpi.y-.24,90,'tc')
 pcb += tc
 
-pcb.connectH(tc['SWDCLK'],[tc['SWDCLK'].x,tc['SWDCLK'].y-.07],rpi['SWDCLK'])
-pcb.connectH(tc['SWDIO'],[tc['SWDIO'].x-.1,rpi['SWDCLK'].y-.09],rpi['SWDIO'])
-pcb.connectH(tc['nRST'],rpi['nRST'])
+pcb.connectH(tc['SWDCLK'],rpi['SWDCLK'])
+pcb.connectH(tc['SWDIO'],rpi['SWDIO'])
+#pcb.connectH(tc['nRST'],rpi['nRST'])
 pcb.connectH(tc['GND'],rpi['GND'])
 
 eps = .02