diff --git a/grbl/config.h b/grbl/config.h
index 076fd91..ec7cc80 100644
--- a/grbl/config.h
+++ b/grbl/config.h
@@ -33,9 +33,9 @@
 
 // Define board type for pin map and default settings.
 //#define CPU_MAP_SMOOTHIEBOARD   // Smoothieboard (NXP LPC1769 MCU)
-//#define CPU_MAP_C3D_REMIX       // Cohesion3D Remix (NXP LPC1769 MCU)
+#define CPU_MAP_C3D_REMIX       // Cohesion3D Remix (NXP LPC1769 MCU)
 //#define CPU_MAP_C3D_MINI        // Cohesion3D Mini (NXP LPC1769 MCU)
-#define CPU_MAP_MKS_SBASE       // MKS SBASE Board (NXP LPC1768 MCU)
+//#define CPU_MAP_MKS_SBASE       // MKS SBASE Board (NXP LPC1768 MCU)
 //#define CPU_MAP_AZTEEG_X5       // Azteeg X5 Board (NXP LPC1769 MCU)
 
 // Define machine type for machine specific defaults
@@ -176,7 +176,7 @@
 // Enables a second coolant control pin via the mist coolant g-code command M7 on the Arduino Uno
 // analog pin 4. Only use this option if you require a second coolant control pin.
 // NOTE: The M8 flood coolant control pin on analog pin 3 will still be functional regardless.
-// #define ENABLE_M7 // Disabled by default. Uncomment to enable.
+//#define ENABLE_M7 // Disabled by default. Uncomment to enable.
 
 // This option causes the feed hold input to act as a safety door switch. A safety door, when triggered,
 // immediately forces a feed hold and then safely de-energizes the machine. Resuming is blocked until
@@ -569,7 +569,7 @@
 
 // LPC176x flash blocks have a rating of 10,000 write cycles. To prevent excess wear, we don't
 // write G10, G28.1, and G30.1. Uncomment to enable these writes.
-// #define STORE_COORD_DATA // Default disabled. Uncomment to enable.
+#define STORE_COORD_DATA // Default disabled. Uncomment to enable.
 
 // In Grbl v0.9 and prior, there is an old outstanding bug where the `WPos:` work position reported
 // may not correlate to what is executing, because `WPos:` is based on the g-code parser state, which
diff --git a/grbl/cpu_map.h b/grbl/cpu_map.h
index 5b8d412..ac71cf3 100644
--- a/grbl/cpu_map.h
+++ b/grbl/cpu_map.h
@@ -197,10 +197,10 @@
   // Define flood and mist coolant enable output pins.
   #define COOLANT_FLOOD_DDR   NotUsed
   #define COOLANT_FLOOD_PORT  NotUsed
-  #define COOLANT_FLOOD_BIT   3  // Uno Analog Pin 3
+  #define COOLANT_FLOOD_BIT   6  // MOSFET 2.6
   #define COOLANT_MIST_DDR   NotUsed
   #define COOLANT_MIST_PORT  NotUsed
-  #define COOLANT_MIST_BIT   4  // Uno Analog Pin 3
+  #define COOLANT_MIST_BIT   7  // MOSFET 2.7
 
   // Define user-control controls (cycle start, reset, feed hold) input pins.
   // NOTE: All CONTROLs pins must be on the same port and not on a port with other input pins (limits).
@@ -299,12 +299,13 @@
   #define LIMIT_MASK       ((1<<X_LIMIT_BIT)|(1<<Y_LIMIT_BIT)|(1<<Z_LIMIT_BIT)|(1<<A_LIMIT_BIT)) // All limit bits
 
   // Define flood and mist coolant enable output pins.
-  #define COOLANT_FLOOD_DDR   NotUsed
-  #define COOLANT_FLOOD_PORT  NotUsed
-  #define COOLANT_FLOOD_BIT   3  // Uno Analog Pin 3
-  #define COOLANT_MIST_DDR   NotUsed
-  #define COOLANT_MIST_PORT  NotUsed
-  #define COOLANT_MIST_BIT   4  // Uno Analog Pin 3
+  #define COOLANT_FLOOD_DDR   LPC_GPIO2->FIODIR
+  #define COOLANT_FLOOD_PORT  LPC_GPIO2->FIOPIN
+  #define COOLANT_FLOOD_BIT   6  // MOSFET 2.6
+  #define COOLANT_MIST_DDR   LPC_GPIO2->FIODIR
+  #define COOLANT_MIST_PORT  LPC_GPIO2->FIOPIN
+  #define COOLANT_MIST_BIT   7  // MOSFET 2.7
+  #define ENABLE_M7             // enables COOLANT MIST
 
   // Define user-control controls (cycle start, reset, feed hold) input pins.
   // NOTE: All CONTROLs pins must be on the same port and not on a port with other input pins (limits).