diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index b7c6b6f5..8a85b83a 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1735,11 +1735,21 @@ def workout_trimp(w, reset=False):
 
 
 def workout_rscore(w, reset=False):
+    dologging('metrics.log','Workout_rscore for {w} {id}, {reset}'.format(
+        w = w,
+        id = w.id,
+        reset = reset
+    ))
     if w.rscore > -1 and not reset:
+        dologging('metrics.log','Returning {rscore}, {normp}'.format(
+            rscore = w.rscore,
+            normp = w.normp,
+        ))
         return w.rscore, w.normp
 
     if get_existing_job(w):
-        return 0, 0
+        dologging('metrics.log','Got existing job, returning whatever we have')
+        return w.rscore, w.normp
 
     r = w.user
     ftp = float(r.ftp)
@@ -1751,6 +1761,8 @@ def workout_rscore(w, reset=False):
         r.hrftp = int(hrftp)
         r.save()
 
+    dologging('metrics.log','Queueing an asynchronous task')
+        
     _ = myqueue(
         queuehigh,
         handle_calctrimp,
@@ -1762,7 +1774,7 @@ def workout_rscore(w, reset=False):
         r.max,
         r.rest)
 
-    return 0, 0
+    return w.rscore, w.normp
 
 
 def workout_normv(w, pp=4.0):
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 4d6987e9..d6dbed73 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ