diff --git a/ruby/lib/jam_ruby/models/artifact_update.rb b/ruby/lib/jam_ruby/models/artifact_update.rb
index a311c0324..ae6f66596 100644
--- a/ruby/lib/jam_ruby/models/artifact_update.rb
+++ b/ruby/lib/jam_ruby/models/artifact_update.rb
@@ -4,7 +4,7 @@ module JamRuby
     DEFAULT_ENVIRONMENT = 'public'
     CLIENT_PREFIX = 'JamClient'
 
-    PRODUCTS = ["#{CLIENT_PREFIX}/Win32", "#{CLIENT_PREFIX}/MacOSX", "#{CLIENT_PREFIX}/JamBlaster", "#{CLIENT_PREFIX}/JamBlasterKernel"]
+    PRODUCTS = ["#{CLIENT_PREFIX}/Win32", "#{CLIENT_PREFIX}/MacOSX", "#{CLIENT_PREFIX}/JamBlaster", "#{CLIENT_PREFIX}/JamBlasterClient"]
 
     self.primary_key = 'id'
     attr_accessible :version, :uri, :sha1, :environment, :product, as: :admin
diff --git a/web/app/assets/javascripts/react-components/stores/JamBlasterStore.js.coffee b/web/app/assets/javascripts/react-components/stores/JamBlasterStore.js.coffee
index 97fb527ae..f242d2794 100644
--- a/web/app/assets/javascripts/react-components/stores/JamBlasterStore.js.coffee
+++ b/web/app/assets/javascripts/react-components/stores/JamBlasterStore.js.coffee
@@ -82,14 +82,16 @@ logger = context.JK.logger
 
             audio.track2 = {stereo: false, right: true, inst: track2Instrument}
 
-
-
-
         logger.debug("updating JamBlaster track state", audio)
         context.jamClient.setJbTrackState(audio);
+        @lastClientTrackState = null
+        #@waitOnTracksDone()
       else
         context.JK.Banner.showAlert('no paired JamBlaster', 'it seems your JamBlaster has become disconnected.  Please ensure it is powered on and connected via an ethernet cable.')
 
+    waitOnTracksDone: () ->
+      @waitingOnTracksDone = true
+      @waitingOnTracksInterval = setInterval()
     convertToClientInstrument: (instrumentId) ->
       clientInstrumentId = null
       if instrumentId != null && instrumentId != ''
diff --git a/web/app/views/users/_user_dropdown.html.erb b/web/app/views/users/_user_dropdown.html.erb
index 761d681cf..31cd39683 100644
--- a/web/app/views/users/_user_dropdown.html.erb
+++ b/web/app/views/users/_user_dropdown.html.erb
@@ -47,7 +47,7 @@
     <% if current_user && current_user.affiliate_partner.present? %>
       <li class="affiliate account-menu-group"><%= link_to "Affiliate Report", '/client#/account/affiliate' %></li>
     <% end %>
-    <% if @nativeClient %>
+    <% if @nativeClient && Rails.application.config.jamblaster_menu %>
       <li class="jamblaster-config"><%= link_to "JamBlaster", '/client#/jamblaster' %></li>
     <% end %>
     <% if current_user && current_user.musician? %>
diff --git a/web/config/application.rb b/web/config/application.rb
index 0cbecfa5a..1ad382aec 100644
--- a/web/config/application.rb
+++ b/web/config/application.rb
@@ -442,5 +442,6 @@ if defined?(Bundler)
     config.olark_enabled = true
     config.jamclass_enabled = false
     config.musician_count = '40,000+'
+    config.jamblaster_menu = false
     end
 end
diff --git a/web/config/environments/development.rb b/web/config/environments/development.rb
index 0113ea09a..370c372f9 100644
--- a/web/config/environments/development.rb
+++ b/web/config/environments/development.rb
@@ -108,4 +108,5 @@ SampleApp::Application.configure do
   config.vst_enabled = true
   config.verify_email_enabled = true
   config.jamclass_enabled = true
+  config.jamblaster_menu = true
 end