diff --git a/trunk/workspace/BMC/Keyboard/advanced/CircuitPython_Commodore_16_KB2040/advanced/CircuitPython 10.x/code.py b/trunk/workspace/BMC/Keyboard/advanced/CircuitPython_Commodore_16_KB2040/advanced/CircuitPython 10.x/code.py
index ca037f67..62ee39ed 100644
--- a/trunk/workspace/BMC/Keyboard/advanced/CircuitPython_Commodore_16_KB2040/advanced/CircuitPython 10.x/code.py	
+++ b/trunk/workspace/BMC/Keyboard/advanced/CircuitPython_Commodore_16_KB2040/advanced/CircuitPython 10.x/code.py	
@@ -23,8 +23,11 @@ POSITIONAL = True
 # R5 C7 R7 C4 R1 C5 C6 R3 R2  R4   C2   C1  R6 C3 C0 R0  # row/column in schematic
 # D2 D3 D4 D5 D6 D7 D8 D9 D10 MOSI MISO SCK A0 A1 A2 A3  # conencted to kb2040 at
 # results in the the following assignment of rows and columns:
-rows = [board.A3, board.D6, board.D10, board.D9, board.MOSI, board.D2, board.A0, board.D4]
-cols = [board.A2, board.SCK, board.MISO, board.A1, board.D5, board.D7, board.D8, board.D3]
+rows = [board.GP15, board.GP4, board.GP8, board.GP7, board.GP9, board.GP0, board.GP12, board.GP2]
+cols = [board.GP14, board.GP11, board.GP10, board.GP13, board.GP3, board.GP5, board.GP6, board.GP1]
+#rows = [board.A3, board.D6, board.D10, board.D9, board.MOSI, board.D2, board.A0, board.D4]
+#cols = [board.A2, board.SCK, board.MISO, board.A1, board.D5, board.D7, board.D8, board.D3]
+
 
 # ROM listing of key values from ed7.src in
 # http://www.zimmers.net/anonftp/pub/cbm/src/plus4/ted_kernal_basic_src.tar.gz
diff --git a/trunk/workspace/BMC/Keyboard/basic/CircuitPython_Commodore_16_KB2040/basic/CircuitPython 10.x/code.py b/trunk/workspace/BMC/Keyboard/basic/CircuitPython_Commodore_16_KB2040/basic/CircuitPython 10.x/code.py
index b3e00863..1f1eca55 100644
--- a/trunk/workspace/BMC/Keyboard/basic/CircuitPython_Commodore_16_KB2040/basic/CircuitPython 10.x/code.py	
+++ b/trunk/workspace/BMC/Keyboard/basic/CircuitPython_Commodore_16_KB2040/basic/CircuitPython 10.x/code.py	
@@ -17,8 +17,10 @@ from adafruit_hid.keycode import Keycode as K
 from adafruit_hid.keyboard import Keyboard
 import usb_hid
 
-rows = [board.A3, board.D6, board.D10, board.D9, board.MOSI, board.D2, board.A0, board.D4]
-cols = [board.A2, board.SCK, board.MISO, board.A1, board.D5, board.D7, board.D8, board.D3]
+rows = [board.GP15, board.GP4, board.GP8, board.GP7, board.GP9, board.GP0, board.GP12, board.GP2]
+cols = [board.GP14, board.GP11, board.GP10, board.GP13, board.GP3, board.GP5, board.GP6, board.GP1]
+#rows = [board.A3, board.D6, board.D10, board.D9, board.MOSI, board.D2, board.A0, board.D4]
+#cols = [board.A2, board.SCK, board.MISO, board.A1, board.D5, board.D7, board.D8, board.D3]
 
 keycodes = [
     K.BACKSPACE, K.ENTER, K.LEFT_ARROW, K.F8, K.F1, K.F2, K.F3, K.LEFT_BRACKET,