diff --git a/examples/javascript/my9221.js b/examples/javascript/my9221.js
index 1f74dcd2..960463fe 100644
--- a/examples/javascript/my9221.js
+++ b/examples/javascript/my9221.js
@@ -26,9 +26,9 @@
 
 var LEDBar = require("jsupm_my9221");
 
-// Instantiate a MY9221, we use D2 for the data, and D3 for the
+// Instantiate a MY9221, we use D8 for the data, and D9 for the
 // data clock.  This was tested with a Grove LED bar.
-var myLEDBar = new LEDBar.MY9221(2, 3);
+var myLEDBar = new LEDBar.GroveLEDBar(8, 9);
 
 var directionBool = true;
 
diff --git a/src/my9221/javaupm_my9221.i b/src/my9221/javaupm_my9221.i
index afb248ae..0534108d 100644
--- a/src/my9221/javaupm_my9221.i
+++ b/src/my9221/javaupm_my9221.i
@@ -1,11 +1,20 @@
 %module javaupm_my9221
 %include "../upm.i"
 
+%include "my9221.h"
 %{
     #include "my9221.h"
 %}
 
-%include "my9221.h"
+%include "groveledbar.h"
+%{
+    #include "groveledbar.h"
+%}
+
+%include "grovecircularled.h"
+%{
+    #include "grovecircularled.h"
+%}
 
 %pragma(java) jniclasscode=%{
     static {
@@ -16,4 +25,4 @@
             System.exit(1);
         }
     }
-%}
\ No newline at end of file
+%}
diff --git a/src/my9221/jsupm_my9221.i b/src/my9221/jsupm_my9221.i
index 77cf0e0b..a8e51e79 100644
--- a/src/my9221/jsupm_my9221.i
+++ b/src/my9221/jsupm_my9221.i
@@ -1,8 +1,18 @@
 %module jsupm_my9221
 %include "../upm.i"
 
+%include "my9221.h"
 %{
     #include "my9221.h"
 %}
 
-%include "my9221.h"
+%include "groveledbar.h"
+%{
+    #include "groveledbar.h"
+%}
+
+%include "grovecircularled.h"
+%{
+    #include "grovecircularled.h"
+%}
+
diff --git a/src/my9221/pyupm_my9221.i b/src/my9221/pyupm_my9221.i
index fc044398..ee9422a5 100644
--- a/src/my9221/pyupm_my9221.i
+++ b/src/my9221/pyupm_my9221.i
@@ -9,3 +9,13 @@
 %{
     #include "my9221.h"
 %}
+
+%include "groveledbar.h"
+%{
+    #include "groveledbar.h"
+%}
+
+%include "grovecircularled.h"
+%{
+    #include "grovecircularled.h"
+%}