diff --git a/libs/servo/targetoverrides.ts b/libs/servo/targetoverrides.ts
index aab890a1..cb457d11 100755
--- a/libs/servo/targetoverrides.ts
+++ b/libs/servo/targetoverrides.ts
@@ -1,6 +1,6 @@
 namespace servos {
     //% block="servo A1" fixedInstance
-    export const A1 = new servos.PinServo(pins.A3);
+    export const A1 = new servos.PinServo(pins.SERVO_LEFT);
     //% block="servo A2" fixedInstance
-    export const A2 = new servos.PinServo(pins.A4);
+    export const A2 = new servos.PinServo(pins.SERVO_RIGHT);
 }
\ No newline at end of file
diff --git a/libs/teknikio-bluebird/device.d.ts b/libs/teknikio-bluebird/device.d.ts
index ce744663..89fde429 100755
--- a/libs/teknikio-bluebird/device.d.ts
+++ b/libs/teknikio-bluebird/device.d.ts
@@ -5,13 +5,17 @@ declare namespace pins {
     //% fixedInstance shim=pxt::getPin(PIN_A2)
     const A2: AnalogInPin;
     //% fixedInstance shim=pxt::getPin(PIN_A3)
-    const A3: PwmOnlyPin;
+    const A3: PwmPin;
     //% fixedInstance shim=pxt::getPin(PIN_A4)
-    const A4: PwmOnlyPin;
+    const A4: PwmPin;
     //% fixedInstance shim=pxt::getPin(PIN_A5)
     const A5: PwmPin;
     //% fixedInstance shim=pxt::getPin(PIN_A6)
     const A6: PwmPin;
+    //% fixedInstance shim=pxt::getPin(PIN_D16)
+    const SERVO_LEFT: PwmOnlyPin;
+    //% fixedInstance shim=pxt::getPin(PIN_D17)
+    const SERVO_RIGHT: PwmOnlyPin;
 
     //% fixedInstance shim=pxt::getPin(PIN_D7)
     const D7: DigitalInOutPin;
@@ -44,3 +48,7 @@ declare namespace rgb {
 declare namespace sensors {
 
 }
+
+declare namespace servos {
+    
+}
\ No newline at end of file