diff --git a/Arduino/Moppy/MoppyConfig.h b/Arduino/Moppy/MoppyConfig.h
index 3d53e23..5f5fbec 100644
--- a/Arduino/Moppy/MoppyConfig.h
+++ b/Arduino/Moppy/MoppyConfig.h
@@ -16,12 +16,12 @@
 
 // Device address for this Arduino (only messages sent to this address
 // will be processed.
-#define DEVICE_ADDRESS 0x02
+#define DEVICE_ADDRESS 0x01
 
 // Minimum and maximum sub-addresses that messages will be processed for.
 // E.g. if you have 8 drives this would be 1 and 8.  If you have 16, 1 and 16.
 #define MIN_SUB_ADDRESS 1
-#define MAX_SUB_ADDRESS 1
+#define MAX_SUB_ADDRESS 8
 
 
 #endif /* SRC_MOPPYCONFIG_H_ */
diff --git a/Arduino/Moppy/MoppyCore.cpp b/Arduino/Moppy/MoppyCore.cpp
index fcd05b5..21a4bb9 100644
--- a/Arduino/Moppy/MoppyCore.cpp
+++ b/Arduino/Moppy/MoppyCore.cpp
@@ -9,8 +9,8 @@
  */
 
 // Floppy drives directly connected to the Arduino's digital pins
-//#include "src/MoppyInstruments/FloppyDrives.h"
-//FloppyDrives instrument = FloppyDrives();
+#include "src/MoppyInstruments/FloppyDrives.h"
+FloppyDrives instrument = FloppyDrives();
 
 
 //Uncomment the 2 next lines and comment the 2 lines above this comment to switch to L298N mode
@@ -19,8 +19,8 @@
 
 
 // A single device (e.g. xylophone, drums, etc.) connected to shift registers
-#include "src/MoppyInstruments/ShiftRegister.h"
-ShiftRegister instrument = ShiftRegister();
+//#include "src/MoppyInstruments/ShiftRegister.h"
+//ShiftRegister instrument = ShiftRegister();
 
 /**********
  * MoppyNetwork classes receive messages sent by the Controller application,