diff --git a/app/assets/javascripts/editor.js.erb b/app/assets/javascripts/editor.js.erb
index dc79ccff..f9ab5b94 100644
--- a/app/assets/javascripts/editor.js.erb
+++ b/app/assets/javascripts/editor.js.erb
@@ -37,6 +37,7 @@ $(function() {
   var ENTER_KEY_CODE = 13;
 
   var flowrOutputBuffer = "";
+  var QaApiOutputBuffer = {'stdout': '', 'stderr': ''};
   var flowrResultHtml = '<div class="panel panel-default"><div id="{{headingId}}" role="tab" class="panel-heading"><h4 class="panel-title"><a data-toggle="collapse" data-parent="#flowrHint" href="#{{collapseId}}" aria-expanded="true" aria-controls="{{collapseId}}"></a></h4></div><div id="{{collapseId}}" role="tabpanel" aria-labelledby="{{headingId}}" class="panel-collapse collapse"><div class="panel-body"></div></div></div>'
 
   var ajax = function(options) {
@@ -317,6 +318,14 @@ $(function() {
     showTab(2);
   };
 
+  var handleQaApiOutput = function() {
+    if (qa_api) {
+      qa_api.executeCommand('syncOutput', [[QaApiOutputBuffer]]);
+      // reset the object
+    }
+    QaApiOutputBuffer = {'stdout': '', 'stderr': ''};
+  }
+
   // activate flowr only for half of the audience
   var isFlowrEnabled = true;//parseInt($('#editor').data('user-id'))%2 == 0;
   var handleStderrOutputForFlowr = function() {
@@ -586,10 +595,15 @@ $(function() {
 
     } else if (output.stderr) {
       element.addClass('text-warning').append(output.stderr);
+      flowrOutputBuffer += output.stderr;
+      QaApiOutputBuffer.stderr += output.stderr;
     } else if (output.stdout) {
       //if (output_mode_is_streaming){
       element.addClass('text-success').append(output.stdout);
       flowrOutputBuffer += output.stdout;
+      QaApiOutputBuffer.stdout += output.stdout;
+
+
       //}else{
       //  element.addClass('text-success');
       //  element.data('content_buffer' , element.data('content_buffer') + output.stdout);
@@ -1037,6 +1051,7 @@ $(function() {
           break;
         case 'exit':
             killWebsocketAndContainer();
+            handleQaApiOutput();
             handleStderrOutputForFlowr();
             break;
         case 'timeout':
diff --git a/lib/docker_client.rb b/lib/docker_client.rb
index 80986377..f993c37c 100644
--- a/lib/docker_client.rb
+++ b/lib/docker_client.rb
@@ -200,7 +200,7 @@ class DockerClient
     execute_command(command, nil, block)
   end
 
-  #only used by server sent events (deprecated?)
+  #only used by score
   def execute_command(command, before_execution_block, output_consuming_block)
     #tries ||= 0
     @container = DockerContainerPool.get_container(@execution_environment)