diff --git a/yask.h b/yask.h
index 4d934fe..1b51be0 100644
--- a/yask.h
+++ b/yask.h
@@ -29,22 +29,25 @@ constexpr uint8_t BUTTON_PINS[] = {
     17, 1, 3,  5,  9, /**/  16, 18, 20, 22, 27, 15,  // Top row
     0,  2, 4,  6,     /**/      19, 21, 26, 28, 14,  // Middle row
             7, 8, 10,  /**/     13, 11, 12,          // Thumb row
-
-    24, // usr button on MCU
 };
-constexpr uint32_t BUTTON_PIN_MASK = 0x1d7fffff;
+constexpr uint32_t BUTTON_PIN_MASK = 0x1c7fffff;
+//                                   0b0001_1100_0111_1111_1111_1111_1111_1111;
+
 
-#define BOOTSEL_BUTTON_INDEX 27
+// #define BOOTSEL_BUTTON_INDEX 26
 
 //
 // Button indexes
-//  0   1   2   3   4   5    |     6   7   8   9  10  11
-// 12  13  14  15  16   5    |     6  17  18  19  20  21
-//                 22  23    |    24  25
+// 0  1  2  3  4  |  5  6  7  8  9 10 
+//11 12 13 14     |    15 16 17 18 19
+//      20 21 22  | 23 24 25         
 // clang-format on
 
+
+
+
 #define JAVELIN_SCRIPT_CONFIGURATION                                           \
-  R"({"name":"YASK","layout":[{"x":0.53,"y":0.1,"r":0.52},{"x":1.43,"y":0.62,"r":0.52},{"x":2.58,"y":0.7,"r":0.52},{"x":3.6,"y":1,"r":0.52},{"x":4.4,"y":1.7,"r":0.52},{"x":5.05,"y":2.18,"w":1,"h":2,"r":0.52},{"x":7.95,"y":2.18,"w":1,"h":2,"r":-0.52},{"x":8.6,"y":1.7,"r":-0.52},{"x":9.4,"y":1,"r":-0.52},{"x":10.42,"y":0.7,"r":-0.52},{"x":11.57,"y":0.62,"r":-0.52},{"x":12.47,"y":0.1,"r":-0.52},{"x":0,"y":1,"r":0.52},{"x":0.9,"y":1.52,"r":0.52},{"x":2.05,"y":1.6,"r":0.52},{"x":3.07,"y":1.9,"r":0.52},{"x":3.87,"y":2.6,"r":0.52},{"x":9.13,"y":2.6,"r":-0.52},{"x":9.93,"y":1.9,"r":-0.52},{"x":10.95,"y":1.6,"r":-0.52},{"x":12.1,"y":1.52,"r":-0.52},{"x":13,"y":1,"r":-0.52},{"x":3.9,"y":4,"r":0.79},{"x":4.64,"y":4.74,"r":0.79},{"x":8.36,"y":4.74,"r":-0.79},{"x":9.1,"y":4,"r":-0.79},{"x":6.75,"y":5.5,"s":0.5},{"x":6.75,"y":3,"s":0.5}]})"
+  R"({"name":"YASK","layout":[ {"x":0,"y":0}, {"x":1,"y":0}, {"x":2,"y":0}, {"x":3,"y":0}, {"x":4,"y":0}, {"x":6,"y":0}, {"x":7,"y":0}, {"x":8,"y":0}, {"x":9,"y":0}, {"x":10,"y":0}, {"x":11,"y":0}, {"x":0,"y":1}, {"x":1,"y":1}, {"x":2,"y":1}, {"x":3,"y":1}, {"x":7,"y":1}, {"x":8,"y":1}, {"x":9,"y":1}, {"x":10,"y":1}, {"x":11,"y":1}, {"x":2,"y":2}, {"x":3,"y":2}, {"x":4,"y":2}, {"x":6,"y":2}, {"x":7,"y":2}, {"x":8,"y":2}]})"
 
 const StenoConfigBlock *const STENO_CONFIG_BLOCK_ADDRESS =
     (const StenoConfigBlock *)0x10040000;
@@ -63,7 +66,7 @@ const size_t STENO_USER_DICTIONARY_SIZE = 0x40000;
 
 const size_t MAXIMUM_MAP_DICTIONARY_SIZE = 0xbc0000;
 const size_t MAXIMUM_BUTTON_SCRIPT_SIZE = 0x1f00;
-const size_t BUTTON_COUNT = 28;
+const size_t BUTTON_COUNT = 26;
 
 const char *const MANUFACTURER_NAME = "ttempe";
 const char *const PRODUCT_NAME = "YASK (Javelin)";