diff --git a/Arduino/motor/src/KlappenSteuerung.cpp b/Arduino/motor/src/KlappenSteuerung.cpp
index 17a73b3..268f863 100644
--- a/Arduino/motor/src/KlappenSteuerung.cpp
+++ b/Arduino/motor/src/KlappenSteuerung.cpp
@@ -12,9 +12,9 @@
  * @param  pinSense
  * @param  id
  */
- KlappenSteuerung::KlappenSteuerung(int pinA, int pinB, int pinSense, int id)
+ KlappenSteuerung::KlappenSteuerung(int pinEnable, int pinSense, int id)
 {
-  setMotorPins(pinA , pinB);
+  setMotorEnablePin(pinEnable);
   SetId(id);
   this->pinSense = pinSense;
   
diff --git a/Arduino/motor/src/KlappenSteuerung.h b/Arduino/motor/src/KlappenSteuerung.h
index e797abd..e32b49a 100644
--- a/Arduino/motor/src/KlappenSteuerung.h
+++ b/Arduino/motor/src/KlappenSteuerung.h
@@ -41,7 +41,7 @@ public:
    * @param  pinSense
    * @param  id
    */
-   KlappenSteuerung(int pinA, int pinB, int pinSense, int id);
+   KlappenSteuerung(int pinEnable, int pinSense, int id);
 
 
   /**
diff --git a/Arduino/motor/src/main.cpp b/Arduino/motor/src/main.cpp
index b16561a..da2f90b 100644
--- a/Arduino/motor/src/main.cpp
+++ b/Arduino/motor/src/main.cpp
@@ -7,7 +7,7 @@
 void Ablauf();
 void AblaufSekunde();
 
-KlappenSteuerung klappe1 (M1A , M1B , M1SENSE , 5  );
+KlappenSteuerung klappe1 (M1ENABLE , M1SENSE , 5  );
 
 
 
@@ -22,7 +22,7 @@ KlappenSteuerung klappe1 (M1A , M1B , M1SENSE , 5  );
 void setup() {
   // put your setup code here, to run once:
   KlappenSteuerung::setupStatic();
-  KlappenSteuerung::setMotorPwmPin(TIMER1_PWM_PIN);
+  KlappenSteuerung::setMotorPwmPins(TIMER1_PWM_PINA , TIMER1_PWM_PINB);
   KlappenSteuerung::setup();
   pinMode(LED_BUILTIN , OUTPUT);
 }
diff --git a/Arduino/motor/src/motor.cpp b/Arduino/motor/src/motor.cpp
index c7d431d..d41c3f7 100644
--- a/Arduino/motor/src/motor.cpp
+++ b/Arduino/motor/src/motor.cpp
@@ -3,17 +3,18 @@
 
 
 
-  uint8_t Motor::pinPwm;
+  uint8_t Motor::pinPwmA;
+  uint8_t Motor::pinPwmB;
 
 
 
-void Motor::setMotorPins(uint8_t pinA , uint8_t pinB){
-  this->pinA = pinA;
-  this->pinB = pinB;
+void Motor::setMotorPwmPins(uint8_t a , uint8_t b){
+  Motor::pinPwmA = a;
+  Motor::pinPwmB = b;
 }
 
-void Motor::setMotorPwmPin(uint8_t pinPwm){
-  Motor::pinPwm = pinPwm;
+void Motor::setMotorEnablePin(uint8_t enable){
+  this->pinEnable = enable;
 }
 
 
@@ -21,18 +22,16 @@ void Motor::setup(){
   ArduinoAnpassung::setup();
   Timer1.initialize(1000); // 10kHz
   //Timer1.attachInterrupt(Motor::interruptEinsprung);
-  Timer1.pwm(Motor::pinPwm, (0));  // 1023 
+  Timer1.pwm(Motor::pinPwmA, (0));  // 1023 
+  Timer1.pwm(Motor::pinPwmB, (0));  // 1023 
   //digitalWrite(LED_BUILTIN , 0 );
 }
 
 
 
 void Motor::memberSetup(){
-  pinMode(pinA , OUTPUT);
-  digitalWrite( pinA , 0);
-
-  pinMode(pinB , OUTPUT);
-  digitalWrite(pinB , 0);
+  pinMode(pinEnable , OUTPUT);
+  digitalWrite( pinEnable , 0);
 }
 
 
diff --git a/Arduino/motor/src/motor.h b/Arduino/motor/src/motor.h
index 6cf10b9..f8dc9eb 100644
--- a/Arduino/motor/src/motor.h
+++ b/Arduino/motor/src/motor.h
@@ -14,16 +14,16 @@ public:
 
   static void setup();
 
-  void setMotorPins(uint8_t pinA , uint8_t pinB);
-  static void setMotorPwmPin(uint8_t pinPwm);
+  static void setMotorPwmPins(uint8_t a , uint8_t b);
+  void setMotorEnablePin(uint8_t enable);
 
   void setSollSpeed(int16_t speed);
 
 protected:
 
   
-  static uint8_t pinPwm;
-
+  static uint8_t pinPwmA;
+  static uint8_t pinPwmB;
 
   void memberSetup();
   void memberLoop();
@@ -34,7 +34,7 @@ protected:
 
   void interruptBerechnungen();
 
-  uint8_t pinA , pinB;
+  uint8_t pinEnable;
   uint16_t timer;
 
   int16_t sollSpeed; 
diff --git a/Arduino/motor/src/pins.h b/Arduino/motor/src/pins.h
index e16f3b7..aae5051 100644
--- a/Arduino/motor/src/pins.h
+++ b/Arduino/motor/src/pins.h
@@ -2,33 +2,32 @@
 #define PINS_H
 
 
-#define TIMER1_PWM_PIN 9
+#define TIMER1_PWM_PINA 9
+#define TIMER1_PWM_PINB 10
 
-#define M1A       2
-#define M1B       3
-#define M1SENSE  A1
+#define M1ENABLE  2
+#define M1SENSE   0
 
-#define M2A       4
-#define M2B       5
-#define M2SENSE  A2
+#define M2ENABLE  3
+#define M2SENSE   1
 
-#define M3A       6
-#define M3B       7
-#define M3SENSE  A3
+#define M3ENABLE  4
+#define M3SENSE   2
 
-#define M4A       8
-#define M4B      10
-#define M4SENSE  A4
+#define M4ENABLE  5
+#define M4SENSE   3
 
-#define M5A      11
-#define M5B      12
-#define M5SENSE  A5
+#define M5ENABLE  6
+#define M5SENSE   4
 
-#define M6A      13
-#define M6B      14
-#define M6SENSE  A6
+#define M6ENABLE  7
+#define M6SENSE   5
 
+#define M6ENABLE  8
+#define M6SENSE   6
 
+#define M6ENABLE  11
+#define M6SENSE   7