diff --git a/edx/analytics/tasks/insights/user_activity.py b/edx/analytics/tasks/insights/user_activity.py
index a81b946432..5c2e6defa0 100644
--- a/edx/analytics/tasks/insights/user_activity.py
+++ b/edx/analytics/tasks/insights/user_activity.py
@@ -45,8 +45,10 @@ def mapper(self, line):
             return
         event, date_string = value
 
-        username = event.get('username', '').strip()
-        if not username:
+        user_id = event.get('context', {}).get('user_id')
+        if not user_id:
+            self.incr_counter('UserActivity', 'Discard Missing User ID', 1)
+            log.error("User-Activity: event without user_id in context: %s", event)
             return
 
         course_id = eventlog.get_course_id(event)
@@ -54,7 +56,7 @@ def mapper(self, line):
             return
 
         for label in self.get_predicate_labels(event):
-            yield date_string, self._encode_tuple((course_id, username, date_string, label))
+            yield date_string, self._encode_tuple((str(user_id), course_id, date_string, label))
 
     def get_predicate_labels(self, event):
         """Creates labels by applying hardcoded predicates to a single event."""
@@ -111,15 +113,15 @@ def multi_output_reducer(self, _date_string, values, output_file):
         counter = Counter(values)
 
         for key, num_events in counter.iteritems():
-            course_id, username, date_string, label = key
-            value = (course_id, username, date_string, label, num_events)
+            user_id, course_id, date_string, label = key
+            value = (user_id, course_id, date_string, label, num_events)
             output_file.write('\t'.join([str(field) for field in value]))
             output_file.write('\n')
 
     def output_path_for_key(self, key):
         date_string = key
         return url_path_join(
-            self.hive_partition_path('user_activity', date_string),
+            self.hive_partition_path('user_activity_by_user', date_string),
             'user_activity_{date}'.format(
                 date=date_string,
             )
@@ -203,17 +205,17 @@ def spark_job(self, *args):
         df = df.filter(
             (df['event_source'] != 'task') &
             ~ df['event_type'].startswith('edx.course.enrollment.') &
-            (df['username'] != '')
+            (df['context.user_id'] != '')
         )
         # passing complete row to UDF
         df = df.withColumn('all_labels', get_labels(df['event_type'], df['event_source'])) \
             .withColumn('course_id', get_courseid(df['context']))
         df = df.filter(df['course_id'] != '')  # remove rows with empty course_id
         df = df.withColumn('label', explode(split(df['all_labels'], ',')))
-        result = df.select('course_id', 'username', 'event_date', 'label') \
-            .groupBy('course_id', 'username', 'event_date', 'label').count()
+        result = df.select('context.user_id', 'course_id', 'event_date', 'label') \
+            .groupBy('user_id', 'course_id', 'event_date', 'label').count()
         result = result.withColumn('dt', lit(result['event_date']))  # generate extra column for partitioning
-        result.coalesce(1).write.partitionBy('dt').csv(self.output_dir().path, mode='append', sep='\t')
+        result.coalesce(4).write.partitionBy('dt').csv(self.output_dir().path, mode='append', sep='\t')
 
 
 class UserActivityDownstreamMixin(WarehouseMixin, EventLogSelectionDownstreamMixin, MapReduceJobTaskMixin):
@@ -256,7 +258,7 @@ def query(self):
 
     @property
     def table(self):
-        return 'user_activity'
+        return 'user_activity_by_user'
 
     @property
     def partition_by(self):
@@ -265,8 +267,8 @@ def partition_by(self):
     @property
     def columns(self):
         return [
+            ('user_id', 'INT'),
             ('course_id', 'STRING'),
-            ('username', 'STRING'),
             ('date', 'STRING'),
             ('category', 'STRING'),
             ('count', 'INT'),
@@ -314,7 +316,7 @@ def requires(self):
     def user_activity_hive_table_path(self, *args):
         return url_path_join(
             self.warehouse_path,
-            'user_activity'
+            'user_activity_by_user'
         )
 
     def calendar_hive_table_path(self, *args):
@@ -329,8 +331,8 @@ def calendar_hive_table_path(self, *args):
 
     def get_user_activity_table_schema(self):
         from pyspark.sql.types import StructType, StringType
-        schema = StructType().add("course_id", StringType(), True) \
-            .add("username", StringType(), True) \
+        schema = StructType().add("user_id", StringType(), True) \
+            .add("course_id", StringType(), True) \
             .add("date", StringType(), True) \
             .add("category", StringType(), True) \
             .add("count", StringType(), True) \
@@ -361,7 +363,7 @@ def spark_job(self, *args):
             sep='\t',
             schema=self.get_calendar_table_schema()
         )
-        user_activity_df.createOrReplaceTempView('user_activity')
+        user_activity_df.createOrReplaceTempView('user_activity_by_user')
         calendar_df.createOrReplaceTempView('calendar')
         query = """
                 SELECT
@@ -369,8 +371,8 @@ def spark_job(self, *args):
                     CONCAT(cal.iso_week_start, " 00:00:00") as interval_start,
                     CONCAT(cal.iso_week_end, " 00:00:00") as interval_end,
                     act.category as label,
-                    COUNT (DISTINCT username) as count
-                FROM user_activity act
+                    COUNT (DISTINCT user_id) as count
+                FROM user_activity_by_user act
                 JOIN calendar cal
                     ON act.date = cal.date AND act.dt >= "{interval_start}" AND act.dt < "{interval_end}"
                 WHERE
@@ -445,8 +447,8 @@ def query(self):
             CONCAT(cal.iso_week_start, ' 00:00:00') as interval_start,
             CONCAT(cal.iso_week_end, ' 00:00:00') as interval_end,
             act.category as label,
-            COUNT(DISTINCT username) as count
-        FROM user_activity act
+            COUNT(DISTINCT user_id) as count
+        FROM user_activity_by_user act
         JOIN calendar cal
             ON act.`date` = cal.`date` AND act.dt >= "{interval_start}" AND act.dt < "{interval_end}"
         WHERE
diff --git a/edx/analytics/tasks/tests/acceptance/fixtures/input/user_activity_tracking.log b/edx/analytics/tasks/tests/acceptance/fixtures/input/user_activity_tracking.log
index 0d03bd1fed..b62c49f5c4 100644
--- a/edx/analytics/tasks/tests/acceptance/fixtures/input/user_activity_tracking.log
+++ b/edx/analytics/tasks/tests/acceptance/fixtures/input/user_activity_tracking.log
@@ -81,7 +81,7 @@
 {"username": "staff", "host": "example.m.sandbox.edx.org", "event_source": "server", "event_type": "/courses/edX/Open_DemoX/edx_demo_course/xblock/i4x:;_;_edX;_Open_DemoX;_problem;_Sample_Algebraic_Problem/handler/xmodule_handler/problem_get", "context": {"username": "staff", "course_user_tags": {}, "user_id": 4, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/courses/edX/Open_DemoX/edx_demo_course/xblock/i4x:;_;_edX;_Open_DemoX;_problem;_Sample_Algebraic_Problem/handler/xmodule_handler/problem_get"}, "time": "2014-06-19T17:52:54.803303+00:00", "ip": "127.0.0.1", "event": "{\"POST\": {}, \"GET\": {}}", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "page": null}
 {"username": "staff", "host": "example.m.sandbox.edx.org", "event_source": "server", "event_type": "/courses/edX/Open_DemoX/edx_demo_course/xblock/i4x:;_;_edX;_Open_DemoX;_problem;_Sample_Algebraic_Problem/handler/xmodule_handler/problem_check", "context": {"username": "staff", "course_user_tags": {}, "user_id": 4, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/courses/edX/Open_DemoX/edx_demo_course/xblock/i4x:;_;_edX;_Open_DemoX;_problem;_Sample_Algebraic_Problem/handler/xmodule_handler/problem_check"}, "time": "2014-06-19T18:27:00.474818+00:00", "ip": "127.0.0.1", "event": "{\"POST\": {\"input_i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1_dynamath\": [\"<math xmlns=\\\"http://www.w3.org/1998/Math/MathML\\\">\\r\\n  <mstyle displaystyle=\\\"true\\\">\\r\\n    <mi>A</mi>\\r\\n    <mo>&#x22C5;</mo>\\r\\n    <msup>\\r\\n      <mi>x</mi>\\r\\n      <mn>2</mn>\\r\\n    </msup>\\r\\n    <mo>+</mo>\\r\\n    <msqrt>\\r\\n      <mrow>\\r\\n        <mi>y</mi>\\r\\n      </mrow>\\r\\n    </msqrt>\\r\\n  </mstyle>\\r\\n</math>\"], \"input_i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1\": [\"A*x^2 + sqrt(y)\"]}, \"GET\":", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "page": null}
 {"username": "staff", "event_type": "problem_check", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "event": "\"input_i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1=A*x%5E2+%2B+sqrt(y)&input_i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1_dynamath=%3Cmath+xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F1998%2FMath%2FMathML%22%3E%0D%0A++%3Cmstyle+displaystyle%3D%22true%22%3E%0D%0A++++%3Cmi%3EA%3C%2Fmi%3E%0D%0A++++%3Cmo%3E%26%23x22C5%3B%3C%2Fmo%3E%0D%0A++++%3Cmsup%3E%0D%0A++++++%3Cmi%3Ex%3C%2Fmi%3E%0D%0A++++++%3Cmn%3E2%3C%2Fmn%3E%0D%0A++++%3C%2Fmsup%3E%0D%0A++++%3Cmo%3E%2B%3C%2Fmo%3E%0D%0A++++%3Cmsqrt%3E%0D%0A++++++%3Cmrow%3E%0D%0A++++++++%3Cmi%3Ey%3C%2Fmi%3E%0D%0A++++++%3C%2Fmrow%3E%0D%0A++++%3C%2Fmsqrt%3E%0D%0A++%3C%2Fmstyle%3E%0D%0A%3C%2Fmath%3E\"", "event_source": "browser", "context": {"username": "staff", "user_id": 4, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/event"}, "time": "2014-06-19T18:27:00.492394+00:00", "page": "http://example.m.sandbox.edx.org/courses/edX/Open_DemoX/edx_demo_course/courseware/interactive_demonstrations/basic_questions/"}
-{"username": "bill", "host": "example.m.sandbox.edx.org", "event_source": "server", "event_type": "problem_check", "context": {"username": "bill", "course_user_tags": {}, "user_id": 4, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "module": {"display_name": "Mathematical Expressions"}, "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/courses/edX/Open_DemoX/edx_demo_course/xblock/i4x:;_;_edX;_Open_DemoX;_problem;_Sample_Algebraic_Problem/handler/xmodule_handler/problem_check"}, "time": "2014-06-19T18:27:01.037362+00:00", "ip": "127.0.0.1", "event": {"submission": {"i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1_dynamath": {"input_type": "", "question": "", "response_type": "", "answer": "<math xmlns=\"http://www.w3.org/1998/Math/MathML\">\r\n  <mstyle displaystyle=\"true\">\r\n    <mi>A</mi>\r\n    <mo>&#x22C5;</mo>\r\n    <msup>\r\n      <mi>x</mi>\r\n      <mn>2</mn>\r\n    </msup>\r\n    <mo>+</mo>\r\n    <msqrt>\r\n      <mrow>\r\n        <mi>y</mi>\r\n      </mrow>\r\n    </msqrt>\r\n  </mstyle>\r\n</math>", "variant": "", "correct": ""}, "i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1": {"input_type": "textline", "question": "", "response_type": "formularesponse", "answer": "A*x^2 + sqrt(y)", "variant": "", "correct": true}}, "success": "correct", "grade": 1, "correct_map": {"i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1": {"hint": "", "hintmode": null, "correctness": "correct", "npoints": null, "msg": "", "queuestate": null}}, "state": {"student_answers": {}, "seed": 1, "done": null, "correct_map": {}, "input_state": {"i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1": {}}}, "answers": {"i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1_dynamath": "<math xmlns=\"http://www.w3.org/1998/Math/MathML\">\r\n  <mstyle displaystyle=\"true\">\r\n    <mi>A</mi>\r\n    <mo>&#x22C5;</mo>\r\n    <msup>\r\n      <mi>x</mi>\r\n      <mn>2</mn>\r\n    </msup>\r\n    <mo>+</mo>\r\n    <msqrt>\r\n      <mrow>\r\n        <mi>y</mi>\r\n      </mrow>\r\n    </msqrt>\r\n  </mstyle>\r\n</math>", "i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1": "A*x^2 + sqrt(y)"}, "attempts": 1, "max_grade": 1, "problem_id": "i4x://edX/Open_DemoX/problem/Sample_Algebraic_Problem"}, "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "page": "x_module"}
+{"username": "bill", "host": "example.m.sandbox.edx.org", "event_source": "server", "event_type": "problem_check", "context": {"username": "bill", "course_user_tags": {}, "user_id": 5, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "module": {"display_name": "Mathematical Expressions"}, "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/courses/edX/Open_DemoX/edx_demo_course/xblock/i4x:;_;_edX;_Open_DemoX;_problem;_Sample_Algebraic_Problem/handler/xmodule_handler/problem_check"}, "time": "2014-06-19T18:27:01.037362+00:00", "ip": "127.0.0.1", "event": {"submission": {"i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1_dynamath": {"input_type": "", "question": "", "response_type": "", "answer": "<math xmlns=\"http://www.w3.org/1998/Math/MathML\">\r\n  <mstyle displaystyle=\"true\">\r\n    <mi>A</mi>\r\n    <mo>&#x22C5;</mo>\r\n    <msup>\r\n      <mi>x</mi>\r\n      <mn>2</mn>\r\n    </msup>\r\n    <mo>+</mo>\r\n    <msqrt>\r\n      <mrow>\r\n        <mi>y</mi>\r\n      </mrow>\r\n    </msqrt>\r\n  </mstyle>\r\n</math>", "variant": "", "correct": ""}, "i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1": {"input_type": "textline", "question": "", "response_type": "formularesponse", "answer": "A*x^2 + sqrt(y)", "variant": "", "correct": true}}, "success": "correct", "grade": 1, "correct_map": {"i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1": {"hint": "", "hintmode": null, "correctness": "correct", "npoints": null, "msg": "", "queuestate": null}}, "state": {"student_answers": {}, "seed": 1, "done": null, "correct_map": {}, "input_state": {"i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1": {}}}, "answers": {"i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1_dynamath": "<math xmlns=\"http://www.w3.org/1998/Math/MathML\">\r\n  <mstyle displaystyle=\"true\">\r\n    <mi>A</mi>\r\n    <mo>&#x22C5;</mo>\r\n    <msup>\r\n      <mi>x</mi>\r\n      <mn>2</mn>\r\n    </msup>\r\n    <mo>+</mo>\r\n    <msqrt>\r\n      <mrow>\r\n        <mi>y</mi>\r\n      </mrow>\r\n    </msqrt>\r\n  </mstyle>\r\n</math>", "i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1": "A*x^2 + sqrt(y)"}, "attempts": 1, "max_grade": 1, "problem_id": "i4x://edX/Open_DemoX/problem/Sample_Algebraic_Problem"}, "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "page": "x_module"}
 {"username": "staff", "event_type": "problem_graded", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "event": "[\"input_i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1=A*x%5E2+%2B+sqrt(y)&input_i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1_dynamath=%3Cmath+xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F1998%2FMath%2FMathML%22%3E%0D%0A++%3Cmstyle+displaystyle%3D%22true%22%3E%0D%0A++++%3Cmi%3EA%3C%2Fmi%3E%0D%0A++++%3Cmo%3E%26%23x22C5%3B%3C%2Fmo%3E%0D%0A++++%3Cmsup%3E%0D%0A++++++%3Cmi%3Ex%3C%2Fmi%3E%0D%0A++++++%3Cmn%3E2%3C%2Fmn%3E%0D%0A++++%3C%2Fmsup%3E%0D%0A++++%3Cmo%3E%2B%3C%2Fmo%3E%0D%0A++++%3Cmsqrt%3E%0D%0A++++++%3Cmrow%3E%0D%0A++++++++%3Cmi%3Ey%3C%2Fmi%3E%0D%0A++++++%3C%2Fmrow%3E%0D%0A++++%3C%2Fmsqrt%3E%0D%0A++%3C%2Fmstyle%3E%0D%0A%3C%2Fmath%3E\",\"\\n\\n\\n<h2 class=\\\"problem-header\\\">\\n  Mathematical Expressions\\n</h2>\\n\\n<div class=\\\"problem-progress\\\"></div>\\n\\n<div class=\\\"problem\\\" role=\\\"application\\\">\\n  <div><span><p>Some edX courses ask you to enter an algebraic expression as an answer. Try entering the following algebraic expression in the box below. It&#8217;s easier than it looks.</p><p> \\\\(A \\\\cdot x^2 + \\\\sqrt{y}\\\\)  \\n    </p><p>\\nThe entry is case sensitive. The product must be indicated with an asterisk, and the exponentiation with a caret, so you would write  \\n\\\"A*x^2 + sqrt(y)\\\".</p></span><span><div id=\\\"inputtype_i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1\\\" class=\\\"text-input-dynamath capa_inputtype  textline\\\"><div class=\\\"correct \\\" id=\\\"status_i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1\\\"><input type=\\\"text\\\" name=\\\"input_i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1\\\" id=\\\"input_i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1\\\" aria-label=\\\"\\\" aria-describedby=\\\"answer_i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1\\\" value=\\\"A*x^2 + sqrt(y)\\\" class=\\\"math\\\" size=\\\"40\\\"/><p class=\\\"status\\\" aria-hidden=\\\"true\\\" aria-describedby=\\\"input_i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1\\\">\\n        A*x^2 + sqrt(y)\\n        -\\n        correct\\n      </p><p id=\\\"answer_i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1\\\" class=\\\"answer\\\" aria-hidden=\\\"true\\\"/><div id=\\\"display_i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1\\\" class=\\\"equation\\\">`{::}`</div><textarea style=\\\"display:none\\\" id=\\\"input_i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1_dynamath\\\" name=\\\"input_i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1_dynamath\\\"/></div></div></span></div>\\n\\n  <div class=\\\"action\\\">\\n    <input type=\\\"hidden\\\" name=\\\"problem_id\\\" value=\\\"Mathematical Expressions\\\" />\\n\\n    <input class=\\\"check Check\\\" type=\\\"button\\\" data-checking=\\\"Checking...\\\" value=\\\"Check\\\" />\\n    <button class=\\\"show\\\"><span class=\\\"show-label\\\" aria-hidden=\\\"true\\\">Show Answer</span> <span class=\\\"sr\\\">Reveal Answer</span></button>\\n  </div>\\n</div>\\n\"]", "event_source": "browser", "context": {"username": "staff", "user_id": 4, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/event"}, "time": "2014-06-19T18:27:01.229375+00:00", "page": "http://example.m.sandbox.edx.org/courses/edX/Open_DemoX/edx_demo_course/courseware/interactive_demonstrations/basic_questions/"}
 {"username": "staff", "host": "example.m.sandbox.edx.org", "event_source": "server", "event_type": "/courses/edX/Open_DemoX/edx_demo_course/xblock/i4x:;_;_edX;_Open_DemoX;_problem;_Sample_Algebraic_Problem/handler/xmodule_handler/problem_check", "context": {"username": "staff", "course_user_tags": {}, "user_id": 4, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/courses/edX/Open_DemoX/edx_demo_course/xblock/i4x:;_;_edX;_Open_DemoX;_problem;_Sample_Algebraic_Problem/handler/xmodule_handler/problem_check"}, "time": "2014-06-19T18:27:02.999557+00:00", "ip": "127.0.0.1", "event": "{\"POST\": {\"input_i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1_dynamath\": [\"<math xmlns=\\\"http://www.w3.org/1998/Math/MathML\\\">\\r\\n  <mstyle displaystyle=\\\"true\\\">\\r\\n    <mi>A</mi>\\r\\n    <mo>&#x22C5;</mo>\\r\\n    <msup>\\r\\n      <mi>x</mi>\\r\\n      <mn>2</mn>\\r\\n    </msup>\\r\\n    <mo>+</mo>\\r\\n    <msqrt>\\r\\n      <mrow>\\r\\n        <mi>y</mi>\\r\\n      </mrow>\\r\\n    </msqrt>\\r\\n  </mstyle>\\r\\n</math>\"], \"input_i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1\": [\"A*x^2 + sqrt(y)\"]}, \"GET\":", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "page": null}
 {"username": "staff", "event_type": "problem_check", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "event": "\"input_i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1=A*x%5E2+%2B+sqrt(y)&input_i4x-edX-Open_DemoX-problem-Sample_Algebraic_Problem_2_1_dynamath=%3Cmath+xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F1998%2FMath%2FMathML%22%3E%0D%0A++%3Cmstyle+displaystyle%3D%22true%22%3E%0D%0A++++%3Cmi%3EA%3C%2Fmi%3E%0D%0A++++%3Cmo%3E%26%23x22C5%3B%3C%2Fmo%3E%0D%0A++++%3Cmsup%3E%0D%0A++++++%3Cmi%3Ex%3C%2Fmi%3E%0D%0A++++++%3Cmn%3E2%3C%2Fmn%3E%0D%0A++++%3C%2Fmsup%3E%0D%0A++++%3Cmo%3E%2B%3C%2Fmo%3E%0D%0A++++%3Cmsqrt%3E%0D%0A++++++%3Cmrow%3E%0D%0A++++++++%3Cmi%3Ey%3C%2Fmi%3E%0D%0A++++++%3C%2Fmrow%3E%0D%0A++++%3C%2Fmsqrt%3E%0D%0A++%3C%2Fmstyle%3E%0D%0A%3C%2Fmath%3E\"", "event_source": "browser", "context": {"username": "staff", "user_id": 4, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/event"}, "time": "2014-06-19T18:27:03.002800+00:00", "page": "http://example.m.sandbox.edx.org/courses/edX/Open_DemoX/edx_demo_course/courseware/interactive_demonstrations/basic_questions/"}
@@ -118,13 +118,13 @@
 {"username": "staff", "event_type": "load_video", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "event": "{\"id\":\"i4x-edX-Open_DemoX-video-0b9e39477cf34507a7a48f74be381fdd\",\"code\":\"b7xgknqkQk8\"}", "event_source": "browser", "context": {"username": "staff", "user_id": 4, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/event"}, "time": "2014-06-19T18:27:52.682355+00:00", "page": "http://example.m.sandbox.edx.org/courses/edX/Open_DemoX/edx_demo_course/courseware/d8a6192ade314473a78242dfeedfbf5b/edx_introduction/"}
 {"username": "staff", "host": "example.m.sandbox.edx.org", "event_source": "server", "event_type": "/courses/edX/Open_DemoX/edx_demo_course/xblock/i4x:;_;_edX;_Open_DemoX;_video;_0b9e39477cf34507a7a48f74be381fdd/handler/xmodule_handler/save_user_state", "context": {"username": "staff", "course_user_tags": {}, "user_id": 4, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/courses/edX/Open_DemoX/edx_demo_course/xblock/i4x:;_;_edX;_Open_DemoX;_video;_0b9e39477cf34507a7a48f74be381fdd/handler/xmodule_handler/save_user_state"}, "time": "2014-06-19T18:27:53.347155+00:00", "ip": "127.0.0.1", "event": "{\"POST\": {\"youtube_is_available\": [\"true\"]}, \"GET\": {}}", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "page": null}
 {"username": "staff", "event_type": "play_video", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "event": "{\"id\":\"i4x-edX-Open_DemoX-video-0b9e39477cf34507a7a48f74be381fdd\",\"currentTime\":0,\"code\":\"b7xgknqkQk8\"}", "event_source": "browser", "context": {"username": "staff", "user_id": 4, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/event"}, "time": "2014-06-19T18:27:54.714937+00:00", "page": "http://example.m.sandbox.edx.org/courses/edX/Open_DemoX/edx_demo_course/courseware/d8a6192ade314473a78242dfeedfbf5b/edx_introduction/"}
-{"username": "bill", "event_type": "play_video", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "event": "{\"id\":\"i4x-edX-Open_DemoX-video-0b9e39477cf34507a7a48f74be381fdd\",\"currentTime\":0,\"code\":\"b7xgknqkQk8\"}", "event_source": "browser", "context": {"username": "bill", "user_id": 4, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/event"}, "time": "2014-06-19T18:27:54.714937+00:00", "page": "http://example.m.sandbox.edx.org/courses/edX/Open_DemoX/edx_demo_course/courseware/d8a6192ade314473a78242dfeedfbf5b/edx_introduction/"}
-{"username": "sarah", "event_type": "play_video", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "event": "{\"id\":\"i4x-edX-Open_DemoX-video-0b9e39477cf34507a7a48f74be381fdd\",\"currentTime\":0,\"code\":\"b7xgknqkQk8\"}", "event_source": "browser", "context": {"username": "sarah", "user_id": 4, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/event"}, "time": "2014-06-19T18:27:54.714937+00:00", "page": "http://example.m.sandbox.edx.org/courses/edX/Open_DemoX/edx_demo_course/courseware/d8a6192ade314473a78242dfeedfbf5b/edx_introduction/"}
+{"username": "bill", "event_type": "play_video", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "event": "{\"id\":\"i4x-edX-Open_DemoX-video-0b9e39477cf34507a7a48f74be381fdd\",\"currentTime\":0,\"code\":\"b7xgknqkQk8\"}", "event_source": "browser", "context": {"username": "bill", "user_id": 5, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/event"}, "time": "2014-06-19T18:27:54.714937+00:00", "page": "http://example.m.sandbox.edx.org/courses/edX/Open_DemoX/edx_demo_course/courseware/d8a6192ade314473a78242dfeedfbf5b/edx_introduction/"}
+{"username": "sarah", "event_type": "play_video", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "event": "{\"id\":\"i4x-edX-Open_DemoX-video-0b9e39477cf34507a7a48f74be381fdd\",\"currentTime\":0,\"code\":\"b7xgknqkQk8\"}", "event_source": "browser", "context": {"username": "sarah", "user_id": 6, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/event"}, "time": "2014-06-19T18:27:54.714937+00:00", "page": "http://example.m.sandbox.edx.org/courses/edX/Open_DemoX/edx_demo_course/courseware/d8a6192ade314473a78242dfeedfbf5b/edx_introduction/"}
 {"username": "staff", "event_type": "seek_video", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "event": "{\"id\":\"i4x-edX-Open_DemoX-video-0b9e39477cf34507a7a48f74be381fdd\",\"old_time\":17.675429,\"new_time\":84,\"type\":\"onSlideSeek\",\"code\":\"b7xgknqkQk8\"}", "event_source": "browser", "context": {"username": "staff", "user_id": 4, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/event"}, "time": "2014-06-19T18:28:12.817653+00:00", "page": "http://example.m.sandbox.edx.org/courses/edX/Open_DemoX/edx_demo_course/courseware/d8a6192ade314473a78242dfeedfbf5b/edx_introduction/"}
 {"username": "staff", "event_type": "play_video", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "event": "{\"id\":\"i4x-edX-Open_DemoX-video-0b9e39477cf34507a7a48f74be381fdd\",\"currentTime\":17.675429,\"code\":\"b7xgknqkQk8\"}", "event_source": "browser", "context": {"username": "staff", "user_id": 4, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/event"}, "time": "2014-06-19T18:28:12.920433+00:00", "page": "http://example.m.sandbox.edx.org/courses/edX/Open_DemoX/edx_demo_course/courseware/d8a6192ade314473a78242dfeedfbf5b/edx_introduction/"}
 {"username": "staff", "event_type": "seek_video", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "event": "{\"id\":\"i4x-edX-Open_DemoX-video-0b9e39477cf34507a7a48f74be381fdd\",\"old_time\":85.478888,\"new_time\":110,\"type\":\"onSlideSeek\",\"code\":\"b7xgknqkQk8\"}", "event_source": "browser", "context": {"username": "staff", "user_id": 4, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/event"}, "time": "2014-06-19T18:28:14.899616+00:00", "page": "http://example.m.sandbox.edx.org/courses/edX/Open_DemoX/edx_demo_course/courseware/d8a6192ade314473a78242dfeedfbf5b/edx_introduction/"}
 {"username": "staff", "event_type": "play_video", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "event": "{\"id\":\"i4x-edX-Open_DemoX-video-0b9e39477cf34507a7a48f74be381fdd\",\"currentTime\":85.478888,\"code\":\"b7xgknqkQk8\"}", "event_source": "browser", "context": {"username": "staff", "user_id": 4, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/event"}, "time": "2014-06-19T18:28:15.014415+00:00", "page": "http://example.m.sandbox.edx.org/courses/edX/Open_DemoX/edx_demo_course/courseware/d8a6192ade314473a78242dfeedfbf5b/edx_introduction/"}
-{"username": "michele", "event_type": "seek_video", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "event": "{\"id\":\"i4x-edX-Open_DemoX-video-0b9e39477cf34507a7a48f74be381fdd\",\"old_time\":111.151913,\"new_time\":154,\"type\":\"onSlideSeek\",\"code\":\"b7xgknqkQk8\"}", "event_source": "browser", "context": {"username": "michele", "user_id": 4, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/event"}, "time": "2014-06-19T18:28:16.582905+00:00", "page": "http://example.m.sandbox.edx.org/courses/edX/Open_DemoX/edx_demo_course/courseware/d8a6192ade314473a78242dfeedfbf5b/edx_introduction/"}
+{"username": "michele", "event_type": "seek_video", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "event": "{\"id\":\"i4x-edX-Open_DemoX-video-0b9e39477cf34507a7a48f74be381fdd\",\"old_time\":111.151913,\"new_time\":154,\"type\":\"onSlideSeek\",\"code\":\"b7xgknqkQk8\"}", "event_source": "browser", "context": {"username": "michele", "user_id": 7, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/event"}, "time": "2014-06-19T18:28:16.582905+00:00", "page": "http://example.m.sandbox.edx.org/courses/edX/Open_DemoX/edx_demo_course/courseware/d8a6192ade314473a78242dfeedfbf5b/edx_introduction/"}
 {"username": "staff", "event_type": "play_video", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "event": "{\"id\":\"i4x-edX-Open_DemoX-video-0b9e39477cf34507a7a48f74be381fdd\",\"currentTime\":111.151913,\"code\":\"b7xgknqkQk8\"}", "event_source": "browser", "context": {"username": "staff", "user_id": 4, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/event"}, "time": "2014-06-19T18:28:16.699525+00:00", "page": "http://example.m.sandbox.edx.org/courses/edX/Open_DemoX/edx_demo_course/courseware/d8a6192ade314473a78242dfeedfbf5b/edx_introduction/"}
 {"username": "staff", "event_type": "seek_video", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "event": "{\"id\":\"i4x-edX-Open_DemoX-video-0b9e39477cf34507a7a48f74be381fdd\",\"old_time\":155.234121,\"new_time\":173,\"type\":\"onSlideSeek\",\"code\":\"b7xgknqkQk8\"}", "event_source": "browser", "context": {"username": "staff", "user_id": 4, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/event"}, "time": "2014-06-19T18:28:18.229757+00:00", "page": "http://example.m.sandbox.edx.org/courses/edX/Open_DemoX/edx_demo_course/courseware/d8a6192ade314473a78242dfeedfbf5b/edx_introduction/"}
 {"username": "staff", "event_type": "play_video", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "event": "{\"id\":\"i4x-edX-Open_DemoX-video-0b9e39477cf34507a7a48f74be381fdd\",\"currentTime\":155.234121,\"code\":\"b7xgknqkQk8\"}", "event_source": "browser", "context": {"username": "staff", "user_id": 4, "ip": "127.0.0.1", "org_id": "edX", "agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "4b7ab990d449aa6958ffd5e0ac7ee3f7", "course_id": "edX/Open_DemoX/edx_demo_course", "path": "/event"}, "time": "2014-06-19T18:28:18.337852+00:00", "page": "http://example.m.sandbox.edx.org/courses/edX/Open_DemoX/edx_demo_course/courseware/d8a6192ade314473a78242dfeedfbf5b/edx_introduction/"}
@@ -204,4 +204,4 @@
 {"username": "dummy_username_2", "event_type": "play_video", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.143 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "495604b91e7522ca25b9da1a15384aaa", "event": "{\"id\":\"0b9e39477cf34507a7a48f74be381fdd\",\"currentTime\":0,\"code\":\"b7xgknqkQk8\"}", "event_source": "browser", "context": {"user_id": 10002, "org_id": "edX", "course_id": "course-v1:edX+DemoX+Test_2014", "path": "/event"}, "time": "2014-06-19T17:47:25.605078+00:00", "page": "http://example.m.sandbox.edx.org/courses/course-v1:edX+DemoX+Test_2014/courseware/d8a6192ade314473a78242dfeedfbf5b/edx_introduction/"}
 {"username": "dummy_username_3", "event_type": "play_video", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.143 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "495604b91e7522ca25b9da1a15384aaa", "event": "{\"id\":\"0b9e39477cf34507a7a48f74be381fdd\",\"currentTime\":0,\"code\":\"b7xgknqkQk8\"}", "event_source": "browser", "context": {"user_id": 10003, "org_id": "edX", "course_id": "course-v1:edX+DemoX+Test_2014", "path": "/event"}, "time": "2014-06-19T17:47:25.605078+00:00", "page": "http://example.m.sandbox.edx.org/courses/course-v1:edX+DemoX+Test_2014/courseware/d8a6192ade314473a78242dfeedfbf5b/edx_introduction/"}
 {"username": "dummy_username_4", "event_type": "seq_next", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.143 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "495604b91e7522ca25b9da1a15384aaa", "event": "{\"old\":5,\"new\":6,\"id\":\"block-v1:edX+DemoX+Test_2014+type@sequential+block@19a30717eff543078a5d94ae9d6c18a5\"}", "event_source": "browser", "context": {"user_id": 10004, "org_id": "edX", "course_id": "course-v1:edX+DemoX+Test_2014", "path": "/event"}, "time": "2014-06-19T17:56:03.028696+00:00", "page": "http://example.m.sandbox.edx.org/courses/course-v1:edX+DemoX+Test_2014/courseware/interactive_demonstrations/19a30717eff543078a5d94ae9d6c18a5/"}
-{"username": "dummy_username_3", "event_type": "play_video", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.143 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "495604b91e7522ca25b9da1a15384aaa", "event": "{\"id\":\"0b9e39477cf34507a7a48f74be381fdd\",\"currentTime\":0,\"code\":\"b7xgknqkQk8\"}", "event_source": "browser", "context": {"user_id": 10003, "org_id": "edX", "course_id": "course-v1:edX+DemoX+Test_2014", "path": "/event"}, "time": "2014-05-25T17:47:25.605078+00:00", "page": "http://example.m.sandbox.edx.org/courses/course-v1:edX+DemoX+Test_2014/courseware/d8a6192ade314473a78242dfeedfbf5b/edx_introduction/"}
+{"username": "dummy_username_3", "event_type": "play_video", "ip": "127.0.0.1", "agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.143 Safari/537.36", "host": "example.m.sandbox.edx.org", "session": "495604b91e7522ca25b9da1a15384aaa", "event": "{\"id\":\"0b9e39477cf34507a7a48f74be381fdd\",\"currentTime\":0,\"code\":\"b7xgknqkQk8\"}", "event_source": "browser", "context": {"user_id": 10003, "org_id": "edX", "course_id": "course-v1:edX+DemoX+Test_2014", "path": "/event"}, "time": "2014-05-25T17:47:25.605078+00:00", "page": "http://example.m.sandbox.edx.org/courses/course-v1:edX+DemoX+Test_2014/courseware/d8a6192ade314473a78242dfeedfbf5b/edx_introduction/"}
\ No newline at end of file
diff --git a/edx/analytics/tasks/warehouse/load_internal_reporting_user_activity.py b/edx/analytics/tasks/warehouse/load_internal_reporting_user_activity.py
index 63979a621e..0b8ce669cc 100644
--- a/edx/analytics/tasks/warehouse/load_internal_reporting_user_activity.py
+++ b/edx/analytics/tasks/warehouse/load_internal_reporting_user_activity.py
@@ -1,18 +1,14 @@
 """
 Loads the user_activity table into the warehouse through the pipeline via Hive.
-
 On the roadmap is to write a task that runs validation queries on the aggregated Hive data pre-load.
 """
-import datetime
 import logging
 
 import luigi.date_interval
 
-from edx.analytics.tasks.common.spark import SparkJobTask
 from edx.analytics.tasks.common.vertica_load import VerticaCopyTask, VerticaCopyTaskMixin
 from edx.analytics.tasks.insights.database_imports import ImportAuthUserTask
-from edx.analytics.tasks.insights.user_activity import InsertToMysqlCourseActivityTask, UserActivityTableTask, \
-    UserActivityTaskSpark
+from edx.analytics.tasks.insights.user_activity import InsertToMysqlCourseActivityTask, UserActivityTableTask
 from edx.analytics.tasks.util.hive import (
     BareHiveTableTask, HivePartition, HivePartitionTask, WarehouseMixin, hive_database_name
 )
@@ -24,230 +20,23 @@
 log = logging.getLogger(__name__)
 
 
-class InternalReportingUserActivityTableTask(BareHiveTableTask):
-
-    @property
-    def table(self):
-        return 'internal_reporting_user_activity'
-
-    @property
-    def partition_by(self):
-        return 'dt'
-
-    @property
-    def columns(self):
-        return [
-            ('user_id', 'INT'),
-            ('course_id', 'STRING'),
-            ('date', 'STRING'),
-            ('activity_type', 'STRING'),
-            ('number_of_activities', 'INT'),
-        ]
-
-
-class InternalReportingUserActivityPartitionTaskSpark(WarehouseMixin, SparkJobTask):
-    """Spark alternative of InternalReportingUserActivityPartitionTask"""
-
-    date = luigi.DateParameter()
-    overwrite_n_days = luigi.IntParameter(
-        config_path={'section': 'user-activity', 'name': 'overwrite_n_days'},
-        significant=False,
-    )
-
-    def run(self):
-        self.remove_output_on_overwrite()
-        super(InternalReportingUserActivityPartitionTaskSpark, self).run()
-
-    def requires(self):
-        required_tasks = [
-            ImportAuthUserTask(overwrite=False, destination=self.warehouse_path)
-        ]
-        if self.overwrite_n_days > 0:
-            overwrite_from_date = self.date - datetime.timedelta(days=self.overwrite_n_days)
-            overwrite_interval = luigi.date_interval.Custom(overwrite_from_date, self.date)
-            required_tasks.append(
-                UserActivityTaskSpark(
-                    interval=overwrite_interval,
-                    warehouse_path=self.warehouse_path,
-                    output_root=self._get_user_activity_hive_table_path(),
-                    overwrite=True,
-                )
-            )
-        yield required_tasks
-
-    def _get_auth_user_hive_table_path(self):
-        import_date = datetime.datetime.utcnow().date() # we only need to join import date's data with user activity
-        return url_path_join(
-            self.warehouse_path,
-            'auth_user',
-            'dt={}'.format(import_date.isoformat())
-        )
-
-    def _get_auth_user_table_schema(self):
-        from pyspark.sql.types import StructType, StringType
-        schema = StructType().add("id", StringType(), True) \
-            .add("username", StringType(), True) \
-            .add("last_login", StringType(), True) \
-            .add("date_joined", StringType(), True) \
-            .add("is_active", StringType(), True) \
-            .add("is_superuser", StringType(), True) \
-            .add("is_staff", StringType(), True) \
-            .add("email", StringType(), True) \
-            .add("dt", StringType(), True)
-        return schema
-
-    def _get_user_activity_hive_table_path(self, *args):
-        return url_path_join(
-            self.warehouse_path,
-            'user_activity'
-        )
-
-    def _get_user_activity_table_schema(self):
-        from pyspark.sql.types import StructType, StringType
-        schema = StructType().add("course_id", StringType(), True) \
-            .add("username", StringType(), True) \
-            .add("date", StringType(), True) \
-            .add("category", StringType(), True) \
-            .add("count", StringType(), True) \
-            .add("dt", StringType(), True)
-        return schema
-
-    def spark_job(self, *args):
-        auth_user_df = self._spark.read.csv(
-            self._get_auth_user_hive_table_path(),
-            schema=self._get_auth_user_table_schema(),
-            sep='\x01',
-            nullValue='\N'
-        )
-        user_activity_df = self._spark.read.csv(
-            self._get_user_activity_hive_table_path(*args),
-            sep='\t',
-            schema=self._get_user_activity_table_schema()
-        )
-        auth_user_df.createOrReplaceTempView('auth_user')
-        user_activity_df.createOrReplaceTempView('user_activity')
-        query = """
-                    SELECT
-                        au.id,
-                        ua.course_id,
-                        ua.date,
-                        ua.category,
-                        ua.count
-                    FROM auth_user au
-                    JOIN user_activity ua
-                        ON au.username = ua.username
-                """
-        result = self._spark.sql(query)
-        result.coalesce(1).write.csv(self.output().path, mode='overwrite', sep='\t')
-        # using broadcast join
-        # from pyspark.sql.functions import broadcast
-        # auth_df = broadcast(auth_user_df)
-        # user_activity_df.join(
-        #     auth_df,
-        #     auth_df.username == user_activity_df.username
-        # ).select(
-        #     auth_df['id'],
-        #     user_activity_df['course_id'],
-        #     user_activity_df['date'],
-        #     user_activity_df['category'],
-        #     user_activity_df['count'],
-        # ).coalesce(1).write.csv(self.output().path, mode='overwrite', sep='\t')
-
-    def output(self):
-        return get_target_from_url(
-            url_path_join(
-                self.warehouse_path,
-                'internal_reporting_user_activity',
-                'dt={}'.format(self.date.isoformat())
-            )
-        )
-
-
-class InternalReportingUserActivityPartitionTask(HivePartitionTask):
-    """Aggregate the user activity table in Hive."""
-
-    date = luigi.DateParameter()
-    n_reduce_tasks = luigi.Parameter()
-    overwrite_n_days = luigi.IntParameter(
-        config_path={'section': 'user-activity', 'name': 'overwrite_n_days'},
-        significant=False,
-    )
-
-    def query(self):
-        query = """
-        USE {database_name};
-        INSERT OVERWRITE TABLE {table} PARTITION ({partition.query_spec})
-        SELECT
-            au.id,
-            ua.course_id,
-            ua.`date`,
-            ua.category,
-            ua.count
-        FROM auth_user au
-        JOIN user_activity ua
-            ON au.username = ua.username;
-        """.format(
-            database_name=hive_database_name(),
-            table=self.hive_table_task.table,
-            partition=self.partition,
-        )
-
-        return query
-
-    def requires(self):
-        yield (
-            ImportAuthUserTask(overwrite=False, destination=self.warehouse_path),
-            self.hive_table_task,
-            UserActivityTableTask(
-                warehouse_path=self.warehouse_path,
-                date=self.date,
-                overwrite_n_days=self.overwrite_n_days,
-            )
-        )
-
-    @property
-    def partition_value(self):
-        return self.date.isoformat()  # pylint: disable=no-member
-
-    @property
-    def hive_table_task(self):
-        return InternalReportingUserActivityTableTask(
-            warehouse_path=self.warehouse_path,
-            overwrite=self.overwrite
-        )
-
-    def remove_output_on_overwrite(self):
-        # HivePartitionTask overrides the behaviour of this method, such that
-        # it does not actually remove the HDFS data. Here we want to make sure that
-        # data is removed from HDFS as well so we default to OverwriteOutputMixin's implementation.
-        OverwriteOutputMixin.remove_output_on_overwrite(self)
-
-    def output(self):
-        # HivePartitionTask returns HivePartitionTarget as output which does not implement remove().
-        # We override output() here so that it can be deleted when overwrite is specified.
-        return get_target_from_url(self.hive_partition_path(self.hive_table_task.table, self.date.isoformat()))
-
-
 class LoadInternalReportingUserActivityToWarehouse(WarehouseMixin, VerticaCopyTask):
     """
     Loads the user activity table from Hive into the Vertica data warehouse.
-
     """
     date = luigi.DateParameter()
     n_reduce_tasks = luigi.Parameter(
         description='Number of reduce tasks',
     )
 
-    @property
-    def partition(self):
-        """The table is partitioned by date."""
-        return HivePartition('dt', self.date.isoformat())  # pylint: disable=no-member
-
     @property
     def insert_source_task(self):
-        hive_table = "internal_reporting_user_activity"
-        partition_location = url_path_join(self.warehouse_path, hive_table, self.partition.path_spec) + '/'
-        return ExternalURL(url=partition_location)
+        hive_table = "user_activity_by_user"
+        # User activity data for each day is stored in a dated directory.
+        # We want to be able to load all that data into Vertica in one go, hence we use
+        # a wildcard('*') here.
+        url = url_path_join(self.warehouse_path, hive_table) + '/dt=*/'
+        return ExternalURL(url=url)
 
     @property
     def table(self):
@@ -277,152 +66,3 @@ def columns(self):
             ('activity_type', 'VARCHAR(200)'),
             ('number_of_activities', 'INTEGER')
         ]
-
-
-class BuildInternalReportingUserActivityCombinedView(VerticaCopyTaskMixin, WarehouseMixin, luigi.Task):
-    """luigi task to build the combined view on top of the history and production tables for user activity."""
-    date = luigi.DateParameter()
-    n_reduce_tasks = luigi.Parameter()
-    history_schema = luigi.Parameter(default='history')
-
-    def requires(self):
-        return {'insert_source': LoadInternalReportingUserActivityToWarehouse(
-            n_reduce_tasks=self.n_reduce_tasks,
-            date=self.date,
-            warehouse_path=self.warehouse_path,
-            overwrite=self.overwrite,
-            schema=self.schema,
-            credentials=self.credentials),
-            'credentials': ExternalURL(self.credentials)}
-
-    @property
-    def view(self):
-        """The "table name" is the name of the view we build over the table we insert here and the history table."""
-        return "f_user_activity_combined"
-
-    def update_id(self):
-        """All that matters is whether we've built the view before, and the parameter information doesn't matter."""
-        return "user_activity_view_built"
-
-    def run(self):
-        """Construct the view on top of the historical and new user activity tables."""
-        connection = self.output().connect()
-        try:
-            cursor = connection.cursor()
-
-            # We mark this task as complete first, since the view creation does an implicit commit.
-            self.output().touch(connection)
-
-            # Creating the view commits the transaction as well.
-            build_view_query = """CREATE VIEW {schema}.{view} AS SELECT * FROM (
-                        SELECT * FROM {schema}.f_user_activity
-                        UNION
-                        SELECT * FROM {history}.f_user_activity
-                    ) AS u""".format(schema=self.schema, view=self.view, history=self.history_schema)
-            log.debug(build_view_query)
-            cursor.execute(build_view_query)
-            log.debug("Committed transaction.")
-        except Exception as exc:
-            log.debug("Rolled back the transaction; exception raised: %s", str(exc))
-            connection.rollback()
-            raise
-        finally:
-            connection.close()
-
-    def output(self):
-        """
-        Returns a Vertica target noting that the update occurred.
-        """
-        return CredentialFileVerticaTarget(
-            credentials_target=self.input()['credentials'],
-            table=self.view,
-            schema=self.schema,
-            update_id=self.update_id()
-        )
-
-    def complete(self):
-        """
-        OverwriteOutputMixin redefines the complete method so that tasks are re-run, which is great for the Vertica
-        loading tasks where we would delete and then re-start, but detrimental here, as the existence of the view does
-        not depend on the data inside the table, only on the table's existence.  We override this method again to
-        revert to the standard luigi complete() method, because we can't meaningfully re-run this task given that
-        CREATE VIEW IF NOT EXISTS and DROP VIEW IF EXISTS are not supported in Vertica.
-        """
-        return self.output().exists()
-
-
-class InternalReportingUserActivityWorkflow(VerticaCopyTaskMixin, WarehouseMixin, luigi.WrapperTask):
-    """Wrapper to provide a single entry point for the user activity table construction and view construction."""
-    date = luigi.DateParameter()
-    n_reduce_tasks = luigi.Parameter()
-    history_schema = luigi.Parameter(default='history')
-
-    def requires(self):
-        """
-        We require the view to be built and the data to be loaded.
-
-        The existence check for the output of the view-building task is merely an attempt to select from the view
-        (and thus makes no guarantee about the freshness of the data in the table), so we may need to re-run the
-        warehouse loading task even if the view-building task has been built, and thus we require the warehouse load
-        task here too.
-        """
-        return [
-            LoadInternalReportingUserActivityToWarehouse(
-                n_reduce_tasks=self.n_reduce_tasks,
-                date=self.date,
-                warehouse_path=self.warehouse_path,
-                overwrite=self.overwrite,
-                schema=self.schema,
-                credentials=self.credentials
-            ),
-            BuildInternalReportingUserActivityCombinedView(
-                n_reduce_tasks=self.n_reduce_tasks,
-                date=self.date,
-                warehouse_path=self.warehouse_path,
-                overwrite=self.overwrite,
-                schema=self.schema,
-                credentials=self.credentials,
-                history_schema=self.history_schema
-            )
-        ]
-
-
-class UserActivityWorkflow(WeeklyIntervalMixin, WarehouseMixin, luigi.WrapperTask):
-
-    overwrite_hive = luigi.BoolParameter(
-        default=False,
-        description='Whether or not to overwrite Hive data.',
-        significant=False
-    )
-
-    overwrite_mysql = luigi.BoolParameter(
-        default=False,
-        description='Whether or not to overwrite existing outputs in Mysql.',
-        significant=False
-    )
-
-    overwrite_n_days = luigi.IntParameter(
-        config_path={'section': 'user-activity', 'name': 'overwrite_n_days'},
-        description='This parameter is used by UserActivityTask which will overwrite user-activity counts '
-                    'for the most recent n days. Default is pulled from user-activity.overwrite_n_days.',
-        significant=False,
-    )
-
-    n_reduce_tasks = luigi.Parameter()
-
-    def requires(self):
-        yield InternalReportingUserActivityPartitionTaskSpark(
-            date=self.end_date,
-            warehouse_path=self.warehouse_path,
-            overwrite_n_days=self.overwrite_n_days,
-            overwrite=self.overwrite_hive,
-        )
-        yield InsertToMysqlCourseActivityTask(
-            end_date=self.end_date,
-            weeks=self.weeks,
-            n_reduce_tasks=self.n_reduce_tasks,
-            warehouse_path=self.warehouse_path,
-            overwrite_n_days=self.overwrite_n_days,
-            overwrite_hive=self.overwrite_hive,
-            overwrite_mysql=self.overwrite_mysql,
-        )