diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index e74a39ee..5568b998 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1053,7 +1053,7 @@ def runcpupdate(
     theids = [w.id for w in theworkouts]
 
     job = myqueue(
-        queue,
+        queuelow,
         handle_updatecp,
         rower.id,
         theids,
@@ -1067,7 +1067,7 @@ def fetchcperg(rower,theworkouts):
     cpdf = getcpdata_sql(rower.id,table='ergcpdata')
 
     job = myqueue(
-        queue,
+        queuelow,
         handle_updateergcp,
         rower.id,
         thefilenames)
@@ -1388,7 +1388,7 @@ def fetchcp(rower,theworkouts,table='cpdata'):
     if not cpdf.empty:
         return cpdf['delta'],cpdf['cp'],avgpower2
     else:
-        job = myqueue(queue,
+        job = myqueue(queuelow,
                       handle_updatecp,
                       rower.id,
                       theids,
diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 4c63f080..17f99870 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -1834,7 +1834,7 @@ def goldmedalscorechart(user,startdate=None,enddate=None):
 
     # all workouts
     alldates,alltestpower,allduration,allids = all_goldmedalstandards(workouts,startdate,enddate)
-    
+
 
     nrdays = (enddate-startdate).days
 
@@ -2041,8 +2041,8 @@ def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7,
     })
 
 
-    endfitness = fitnesses[-1]
-    endfatigue = fatigues[-1]
+    endfitness = fitnesses[-2]
+    endfatigue = fatigues[-2]
     endform = endfitness-endfatigue
 
     if modelchoice == 'banister':
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 774b66ed..769958cc 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -1676,27 +1676,17 @@ def performancemanager_view(request,userid=0,mode='rower',
             'dofatigue':dofatigue,
             })
 
-    if not is_ajax:
-        script, thediv, endfitness, endfatigue, endform, ids = performance_chart(
-            theuser,startdate=startdate,enddate=enddate,
-            kfitness = kfitness,
-            kfatigue = kfatigue,
-            metricchoice = metricchoice,
-            doform = doform,
-            dofatigue = dofatigue,
-            showtests = True,
-            )
-    else:
-        script, thediv, endfitness, endfatigue, endform, ids = performance_chart(
-            theuser,startdate=startdate,enddate=enddate,
-            kfitness = kfitness,
-            kfatigue = kfatigue,
-            metricchoice = metricchoice,
-            doform = doform,
-            dofatigue = dofatigue,
-            showtests = False,
-            )
 
+    script, thediv, endfitness, endfatigue, endform, ids = performance_chart(
+        theuser,startdate=startdate,enddate=enddate,
+        kfitness = kfitness,
+        kfatigue = kfatigue,
+        metricchoice = metricchoice,
+        doform = doform,
+        dofatigue = dofatigue,
+        showtests = True,
+        )
+    
     ids = pd.Series(ids).dropna().values
 
     bestworkouts = Workout.objects.filter(id__in=ids).order_by('date')