diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 1c315fd9..64d0cd0a 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -1602,6 +1602,27 @@ def fitnessfit_chart(workouts,user,workoutmode='water',startdate=None,
                                           date__gte=startdate,
                                           duplicate=False,
                                           )
+
+    df = pd.DataFrame({
+        'date':dates,
+        'testpower':testpower,
+        'fatigue':fatigues,
+        'fitness':fitnesses,
+    })
+    df.sort_values(['date'],inplace=True)
+
+
+    df['testdup'] = df['testpower'].shift(1)
+    df['testpower'] = df.apply(lambda x: np.nan if abs(x['testpower'] - x['testdup']) < 4 \
+                               else x['testpower'],axis=1)
+
+    dates = [d for d in df['date']]
+    testpower = df['testpower'].values.tolist()
+    fatigues = df['fatigue'].values.tolist()
+    fitnesses = df['fitness'].values.tolist()
+
+
+
     for w in allworkouts:
         # create Fitness and Fatigue number
         fatigue = 0
@@ -1640,17 +1661,11 @@ def fitnessfit_chart(workouts,user,workoutmode='water',startdate=None,
 
 
     df.sort_values(['date'],inplace=True)
-
-
     df = df.groupby(['date']).max()
     df['date'] = df.index.values
 
 
-    df['testdup'] = df['testpower'].shift(1)
-    df['testpower'] = df.apply(lambda x: np.nan if abs(x['testpower'] - x['testdup']) < 4 \
-                               else x['testpower'],axis=1)
 
-    
 
     source = ColumnDataSource(
         data = dict(