diff --git a/plotly/plotly/plotly.py b/plotly/plotly/plotly.py
index 432a4888074..e3ba3fa4292 100644
--- a/plotly/plotly/plotly.py
+++ b/plotly/plotly/plotly.py
@@ -406,14 +406,15 @@ class Stream:
     Stream example:
     # Initialize a streaming graph
     # by embedding stream_id's in the graph's traces
-    >>> stream_id = "your_stream_id" # See {plotly_domain}/settings
-    >>> py.plot(Data([Scatter(x=[],
-                              y=[],
-                              stream=dict(token=stream_id, maxpoints=100))])
+    import plotly.plotly as py
+    from plotly.graph_objs import Data, Scatter, Stream
+    stream_id = "your_stream_id" # See {plotly_domain}/settings
+    py.plot(Data([Scatter(x=[], y=[],
+                          stream=Stream(token=stream_id, maxpoints=100))]))
     # Stream data to the import trace
-    >>> stream = Stream(stream_id) # Initialize a stream object
-    >>> stream.open() # Open the stream
-    >>> stream.write(dict(x=1, y=1)) # Plot (1, 1) in your graph
+    stream = Stream(stream_id) # Initialize a stream object
+    stream.open() # Open the stream
+    stream.write(dict(x=1, y=1)) # Plot (1, 1) in your graph
     """
 
     @utils.template_doc(**tools.get_config_file())
diff --git a/plotly/widgets/graphWidget.js b/plotly/widgets/graphWidget.js
index eb1ccbc0eb5..f9f5baa8249 100644
--- a/plotly/widgets/graphWidget.js
+++ b/plotly/widgets/graphWidget.js
@@ -11,19 +11,24 @@ require(["widgets/js/widget"], function(WidgetManager){
         render: function(){
             var that = this;
 
-            var frameId = window.genUID();
-            var loadingId = 'loading-'+frameId;
+            var graphId = window.genUID();
+            var loadingId = 'loading-'+graphId;
 
 
             var _graph_url = that.model.get('_graph_url');
 
-            // variable plotly_domain in the case of enterprise
+            // variable plotlyDomain in the case of enterprise
             var url_parts = _graph_url.split('/');
-            var plotly_domain = url_parts[0] + '//' + url_parts[2];
+            var plotlyDomain = url_parts[0] + '//' + url_parts[2];
+
+            if(!('plotlyDomains' in window)){
+                window.plotlyDomains = {};
+            }
+            window.plotlyDomains[graphId] = plotlyDomain;
 
             // Place IFrame in output cell div `$el`
             that.$el.css('width', '100%');
-            that.$graph = $(['<iframe id="'+frameId+'"',
+            that.$graph = $(['<iframe id="'+graphId+'"',
                              'src="'+_graph_url+'.embed"',
                              'seamless',
                              'style="border: none;"',
@@ -40,9 +45,9 @@ require(["widgets/js/widget"], function(WidgetManager){
                 window.pingers = {};
             }
 
-            window.pingers[frameId] = setInterval(function() {
-                that.graphContentWindow = $('#'+frameId)[0].contentWindow;
-                that.graphContentWindow.postMessage({ping: true}, plotly_domain);
+            window.pingers[graphId] = setInterval(function() {
+                that.graphContentWindow = $('#'+graphId)[0].contentWindow;
+                that.graphContentWindow.postMessage({task: 'ping'}, plotlyDomain);
             }, 200);
 
             // Assign a message listener to the 'message' events
@@ -53,48 +58,46 @@ require(["widgets/js/widget"], function(WidgetManager){
                  window.messageListeners = {};
             }
 
-            window.messageListeners[frameId] = function(e) {
+            window.messageListeners[graphId] = function(e) {
                 if(_graph_url.indexOf(e.origin)>-1) {
-                    var frame = document.getElementById(frameId);
+                    var frame = document.getElementById(graphId);
 
                     if(frame === null){
                         // frame doesn't exist in the dom anymore, clean up it's old event listener
-                        window.removeEventListener('message', window.messageListeners[frameId]);
-                        clearInterval(window.pingers[frameId]);
+                        window.removeEventListener('message', window.messageListeners[graphId]);
+                        clearInterval(window.pingers[graphId]);
                     } else if(frame.contentWindow === e.source) {
                         // TODO: Stop event propagation, so each frame doesn't listen and filter
-                        var frameContentWindow = $('#'+frameId)[0].contentWindow;
+                        var frameContentWindow = $('#'+graphId)[0].contentWindow;
                         var message = e.data;
 
                         if(message==='pong') {
-                            $('#loading-'+frameId).hide();
-                            clearInterval(window.pingers[frameId]);
-                            that.send({event: 'pong', graphId: frameId});
+                            $('#loading-'+graphId).hide();
+                            clearInterval(window.pingers[graphId]);
+                            that.send({event: 'pong', graphId: graphId});
                         } else if (message.type==='hover' ||
                                    message.type==='zoom'  ||
                                    message.type==='click' ||
                                    message.type==='unhover') {
-                            that.send({event: message.type, message: message, graphId: frameId});
+                            that.send({event: message.type, message: message, graphId: graphId});
                         }
                     }
                 }
             };
 
-            window.removeEventListener('message', window.messageListeners[frameId]);
-            window.addEventListener('message', window.messageListeners[frameId]);
+            window.removeEventListener('message', window.messageListeners[graphId]);
+            window.addEventListener('message', window.messageListeners[graphId]);
 
         },
 
         update: function() {
             // Listen for messages from the graph widget in python
             var jmessage = this.model.get('_message');
-
             var message = JSON.parse(jmessage);
 
             // check for duplicate messages
             if(!('messageIds' in window)){
                 window.messageIds = {};
-                window.messageIds[message.uid] = true;
             }
 
             if(!(message.uid in window.messageIds)){
@@ -102,7 +105,7 @@ require(["widgets/js/widget"], function(WidgetManager){
                 window.messageIds[message.uid] = true;
 
                 var plot = $('#'+message.graphId)[0].contentWindow;
-                plot.postMessage(message, message.plotlyDomain);
+                plot.postMessage(message, window.plotlyDomains[message.graphId]);
             }
 
             return GraphView.__super__.update.apply(this);
diff --git a/plotly/widgets/graph_widget.py b/plotly/widgets/graph_widget.py
index 823d64663e2..bf3d89fd1ab 100644
--- a/plotly/widgets/graph_widget.py
+++ b/plotly/widgets/graph_widget.py
@@ -8,8 +8,6 @@
 from IPython.utils.traitlets import Unicode
 from IPython.display import Javascript, display
 
-import plotly
-
 # Load JS widget code
 # No officially recommended way to do this in any other way
 # http://mail.scipy.org/pipermail/ipython-dev/2014-April/013835.html
@@ -88,11 +86,10 @@ def _handle_registration(self, event_type, callback, remove):
         event_callbacks = self._event_handlers[event_type].callbacks
         if (len(event_callbacks) and event_type not in self._listener_set):
             self._listener_set.add(event_type)
-            message = {'listen': list(self._listener_set)}
+            message = {'task': 'listen', 'events': list(self._listener_set)}
             self._handle_outgoing_message(message)
 
     def _handle_outgoing_message(self, message):
-        message['plotlyDomain'] = plotly.plotly.get_config()['plotly_domain']
         if self._graphId == '':
             self._clientMessages.append(message)
         else:
@@ -124,18 +121,24 @@ def on_zoom(self, callback, remove=False):
             Set to true to remove the callback from the list of callbacks."""
         self._handle_registration('zoom', callback, remove)
 
-    def restyle(self, data, traces=None):
-        message = {'restyle': data, 'graphId': self._graphId}
-        if traces:
-            message['traces'] = traces
+    def restyle(self, data, indices=None):
+        message = {'task': 'restyle', 'update': data, 'graphId': self._graphId}
+        if indices:
+            message['indices'] = indices
         self._handle_outgoing_message(message)
 
     def relayout(self, layout):
-        message = {'relayout': layout, 'graphId': self._graphId}
+        message = {
+            'task': 'relayout', 'update': layout, 'graphId': self._graphId
+        }
         self._handle_outgoing_message(message)
 
-    def hover(self, hover_obj):
-        message = {'hover': hover_obj, 'graphId': self._graphId}
+    def hover(self, hover_obj, subplot=None):
+        message = {
+            'task': 'hover', 'selection': hover_obj, 'graphId': self._graphId
+        }
+        if subplot is not None:
+            message['subplot'] = subplot
         self._handle_outgoing_message(message)
 
     def add_traces(self, traces, new_indices=None):
@@ -149,10 +152,11 @@ def add_traces(self, traces, new_indices=None):
             added traces should occupy.
 
         """
-        body = {'traces': traces}
+        message = {
+            'task': 'addTraces', 'traces': traces, 'graphId': self._graphId
+        }
         if new_indices is not None:
-            body['newIndices'] = new_indices
-        message = {'addTraces': body}
+            message['newIndices'] = new_indices
         self._handle_outgoing_message(message)
 
     def delete_traces(self, indices):
@@ -162,7 +166,11 @@ def delete_traces(self, indices):
         :param (list[int]) indices: The indices of the traces to be removed
 
         """
-        message = {'deleteTraces': {'indices': indices}}
+        message = {
+            'task': 'deleteTraces',
+            'indices': indices,
+            'graphId': self._graphId
+        }
         self._handle_outgoing_message(message)
 
     def move_traces(self, current_indices, new_indices=None):
@@ -178,8 +186,11 @@ def move_traces(self, current_indices, new_indices=None):
             traces to be moved will occupy.
 
         """
-        body = {'currentIndices': current_indices}
+        message = {
+            'task': 'moveTraces',
+            'currentIndices': current_indices,
+            'graphId': self._graphId
+            }
         if new_indices is not None:
-            body['newIndices'] = new_indices
-        message = {'moveTraces': body}
+            message['newIndices'] = new_indices
         self._handle_outgoing_message(message)
diff --git a/requirements.txt b/requirements.txt
index 4c6eebe257f..66ccab53a00 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,3 +13,7 @@ six==1.8.0
 
 ## timezone definitions ##
 pytz==2014.9
+
+## 2.6 python dependencies ##
+simplejson==3.6.5
+ordereddict==1.1
diff --git a/setup.py b/setup.py
index 3ac519138f5..52de4726c1d 100644
--- a/setup.py
+++ b/setup.py
@@ -40,5 +40,9 @@ def readme():
                 'plotly/matplotlylib/mplexporter',
                 'plotly/matplotlylib/mplexporter/renderers'],
       package_data={'plotly': ['graph_reference/*.json']},
-      install_requires=['requests', 'six', 'pytz'],
+      install_requires=['requests',
+                        'six',
+                        'pytz',
+                        'ordereddict',
+                        'simplejson'],
       zip_safe=False)