diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index fb14ff07..74ef224a 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -70,27 +70,15 @@ class SubmissionsController < ApplicationController
 
   def run
     with_server_sent_events do |server_sent_event|
-      container_info_sent = false
-      stderr = ''
       output = @docker_client.execute_run_command(@submission, params[:filename])
-      if output
-        server_sent_event.write({stdout: output[:stdout]}, event: 'output')
-        server_sent_event.write({stderr: output[:stderr]}, event: 'output')
-        output[:status] = :ok if output[:status] == 0
-        server_sent_event.write({status: output[:status]}, event: 'status')
-      end
-      #server_sent_event.write({stdout: output[:output][2], event: 'status')
-      # do |stream, chunk|
-      #   unless container_info_sent
-      #     server_sent_event.write({id: @docker_client.container.try(:id), port_bindings: @docker_client.container.try(:port_bindings)}, event: 'info')
-      #     container_info_sent = true
-      #   end
-      #   server_sent_event.write({stream => chunk}, event: 'output')
-      #   stderr += chunk if stream == :stderr
-      # end
-      # server_sent_event.write(output, event: 'status')
-      if stderr.present?
-        if hint = Whistleblower.new(execution_environment: @submission.execution_environment).generate_hint(stderr)
+      
+      server_sent_event.write({stdout: output[:stdout]}, event: 'output') if output[:stdout]
+      server_sent_event.write({stderr: output[:stderr]}, event: 'output') if output[:stderr]
+      
+      server_sent_event.write({status: output[:status]}, event: 'status')
+      
+      unless output[:stderr].nil?
+        if hint = Whistleblower.new(execution_environment: @submission.execution_environment).generate_hint(output[:stderr])
           server_sent_event.write(hint, event: 'hint')
         else
           store_error(stderr)
diff --git a/lib/docker_client.rb b/lib/docker_client.rb
index 98918179..8d43fc5f 100644
--- a/lib/docker_client.rb
+++ b/lib/docker_client.rb
@@ -177,16 +177,9 @@ class DockerClient
   def send_command(command, container, &block)
     Timeout.timeout(@execution_environment.permitted_execution_time.to_i) do
       output = container.exec(['bash', '-c', command])
-      #do |stream, chunk|
-      #  block.call(stream, chunk) if block_given? #this may issue
-      #  if stream == :stderr
-      ##    stderr.push(chunk)
-      #  else
-      #    stdout.push(chunk)
-      #  end
-      #end
+      Rails.logger.info "output from container.exec"
       Rails.logger.info output
-      {status: output[2], stderr: output[1].join, stdout: output[0].join}
+      {status: output[2] == 0 ? :ok : :failed, stdout: output[0].join, stderr: output[1].join}
     end
   rescue Timeout::Error
     timeout_occured = true
@@ -202,7 +195,7 @@ class DockerClient
       container = self.class.create_container(@execution_environment)
       DockerContainerPool.add_to_all_containers(container, @execution_environment)
     end
-    {status: :timeout,  stderr: '', stdout: ''}
+    {status: :timeout}
   ensure
     Rails.logger.info('send_command ensuring for' + container.to_s)
     RECYCLE_CONTAINERS ? return_container(container) : self.class.destroy_container(container)