diff --git a/app/assets/javascripts/editor.js.erb b/app/assets/javascripts/editor.js.erb
index 80b82bd7..968951a8 100644
--- a/app/assets/javascripts/editor.js.erb
+++ b/app/assets/javascripts/editor.js.erb
@@ -310,14 +310,14 @@ $(function() {
     //console.log("Text is the same: " + same);
 
     // if the text is not copied from within the editor (from any file), send an event to lanalytics
-    //if(!same){
-    //  publishCodeOceanEvent("codeocean_editor_paste", {
-    //    text: pasteObject.text,
-    //    exercise: $('#editor').data('exercise-id'),
-    //    file_id: "1"
-    //
-    //  });
-    //}
+    if(!same){
+      publishCodeOceanEvent("codeocean_editor_paste", {
+        text: pasteObject.text,
+        exercise: $('#editor').data('exercise-id'),
+        file_id: "1"
+
+      });
+    }
   };
 
   var handleScoringResponse = function(response) {
diff --git a/app/assets/javascripts/exercises.js b/app/assets/javascripts/exercises.js
index b236e75e..1f861ef6 100644
--- a/app/assets/javascripts/exercises.js
+++ b/app/assets/javascripts/exercises.js
@@ -154,7 +154,10 @@ $(function() {
     } else if ($('.edit_exercise, .new_exercise').isPresent()) {
       execution_environments = $('form').data('execution-environments');
       file_types = $('form').data('file-types');
-      new MarkdownEditor('#exercise_instructions');
+     // new MarkdownEditor('#exercise_instructions');
+      new MarkdownEditor('#exercise_description');
+      // todo: add an ace editor for each file
+
       enableInlineFileCreation();
       inferFileAttributes();
       observeFileRoleChanges();
diff --git a/app/views/exercises/_form.html.slim b/app/views/exercises/_form.html.slim
index 1002f78a..c4d312cc 100644
--- a/app/views/exercises/_form.html.slim
+++ b/app/views/exercises/_form.html.slim
@@ -8,15 +8,16 @@
     = f.text_field(:title, class: 'form-control', required: true)
   .form-group
     = f.label(:description)
-    = f.text_area(:description, class: 'form-control')
+    = f.hidden_field(:description)
+    .form-control.markdown
   .form-group
     = f.label(:execution_environment_id)
     = f.collection_select(:execution_environment_id, @execution_environments, :id, :name, {}, class: 'form-control')
-  .form-group
+  /.form-group
     = f.label(:instructions)
     = f.hidden_field(:instructions)
     .form-control.markdown
-  .form-group
+  /.form-group
     = f.label(:team_id)
     = f.collection_select(:team_id, @teams, :id, :name, {include_blank: true}, class: 'form-control')
   .checkbox