diff --git a/files/images/devices/BR-0016-01-3T.jpg b/files/images/devices/BR-0016-01-3T.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..534eba3f0b7cfa4f16f7aeab02f410bc489bc50b
Binary files /dev/null and b/files/images/devices/BR-0016-01-3T.jpg differ
diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index c9e4ccbf482b76511396ee7a402d82f556a68c29..bf6092bcf18f3dad831d964dfb0a719c2d0f2239 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -113,6 +113,7 @@
         <file>files/images/devices/BR-APMPWRDEAN-2.jpg</file>
         <file>files/images/devices/AC-0004-11-2.jpg</file>
         <file>files/images/devices/BR-0004-03-2.jpg</file>
+        <file>files/images/devices/BR-0016-01-3T.jpg</file>
     </qresource>
     <qresource prefix="/general">
         <file alias="vera.ttf">files/styles/Vera.ttf</file>
diff --git a/src/ui/configuration/OpticalFlowConfig.cc b/src/ui/configuration/OpticalFlowConfig.cc
index bc977317b1d0d8c638d32ecc4972a4089945d99b..7c39431174cbb031f91217b8de8616970b3ddb1a 100644
--- a/src/ui/configuration/OpticalFlowConfig.cc
+++ b/src/ui/configuration/OpticalFlowConfig.cc
@@ -1,11 +1,36 @@
 #include "OpticalFlowConfig.h"
+#include <QMessageBox>
 
-
-OpticalFlowConfig::OpticalFlowConfig(QWidget *parent) : QWidget(parent)
+OpticalFlowConfig::OpticalFlowConfig(QWidget *parent) : AP2ConfigWidget(parent)
 {
     ui.setupUi(this);
+    connect(ui.enableCheckBox,SIGNAL(clicked(bool)),this,SLOT(enableCheckBoxClicked(bool)));
 }
 
 OpticalFlowConfig::~OpticalFlowConfig()
 {
 }
+void OpticalFlowConfig::parameterChanged(int uas, int component, QString parameterName, QVariant value)
+{
+    if (parameterName == "FLOW_ENABLE")
+    {
+        if (value.toInt() == 0)
+        {
+            ui.enableCheckBox->setChecked(false);
+        }
+        else
+        {
+            ui.enableCheckBox->setChecked(true);
+        }
+    }
+}
+
+void OpticalFlowConfig::enableCheckBoxClicked(bool checked)
+{
+    if (!m_uas)
+    {
+        QMessageBox::information(0,tr("Error"),tr("Please connect to a MAV before attempting to set configuration"));
+        return;
+    }
+    m_uas->setParameter(0,"FLOW_ENABLE",checked ? 1 : 0);
+}
diff --git a/src/ui/configuration/OpticalFlowConfig.h b/src/ui/configuration/OpticalFlowConfig.h
index 72ea2b0a3ef0a99f8fc4f0e1c233b39f86cf1e63..38b4ae7ebb83f565a80a315ad11d870bf89fc0f3 100644
--- a/src/ui/configuration/OpticalFlowConfig.h
+++ b/src/ui/configuration/OpticalFlowConfig.h
@@ -2,16 +2,19 @@
 #define OPTICALFLOWCONFIG_H
 
 #include <QWidget>
+#include "AP2ConfigWidget.h"
 #include "ui_OpticalFlowConfig.h"
 
-class OpticalFlowConfig : public QWidget
+class OpticalFlowConfig : public AP2ConfigWidget
 {
     Q_OBJECT
     
 public:
     explicit OpticalFlowConfig(QWidget *parent = 0);
     ~OpticalFlowConfig();
-    
+private slots:
+    void parameterChanged(int uas, int component, QString parameterName, QVariant value);
+    void enableCheckBoxClicked(bool checked);
 private:
     Ui::OpticalFlowConfig ui;
 };
diff --git a/src/ui/configuration/OpticalFlowConfig.ui b/src/ui/configuration/OpticalFlowConfig.ui
index 19ffbd7e409d06abf59ab7ed28e6d79e0ffcb7a0..e5a5bce4c6406af6cb060bce8447517871586632 100644
--- a/src/ui/configuration/OpticalFlowConfig.ui
+++ b/src/ui/configuration/OpticalFlowConfig.ui
@@ -29,7 +29,41 @@
     <bool>false</bool>
    </property>
   </widget>
+  <widget class="QCheckBox" name="enableCheckBox">
+   <property name="geometry">
+    <rect>
+     <x>100</x>
+     <y>60</y>
+     <width>70</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Enable</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_2">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>60</y>
+     <width>81</width>
+     <height>71</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="../../../qgroundcontrol.qrc">:/files/images/devices/BR-0016-01-3T.jpg</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>true</bool>
+   </property>
+  </widget>
  </widget>
- <resources/>
+ <resources>
+  <include location="../../../qgroundcontrol.qrc"/>
+ </resources>
  <connections/>
 </ui>