diff --git a/rowers/models.py b/rowers/models.py
index 745e9386..3050fc48 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -906,14 +906,6 @@ class Rower(models.Model):
                                           'Pwr TR',
                                           'Pwr AN'])
 
-    hrzones = PowerZonesField(default=['Rest',
-                                          'UT2',
-                                          'UT1',
-                                          'AT',
-                                          'TR',
-                                          'AN','max'])
-
-
     emailalternatives = AlternativeEmails(default=[],null=True,blank=True,verbose_name='Alternative Email addresses (separate with ",")')
 
     # Site Settings
@@ -944,6 +936,11 @@ class Rower(models.Model):
     tptokenexpirydate = models.DateTimeField(blank=True,null=True)
     tprefreshtoken = models.CharField(default='',max_length=1000,
                                                blank=True,null=True)
+    rp3token = models.CharField(default='',max_length=1000,blank=True,null=True)
+    rp3tokenexpirydate = models.DateTimeField(blank=True,null=True)
+    rp3refreshtoken = models.CharField(default='',max_length=1000,
+                                               blank=True,null=True)
+
     trainingpeaks_auto_export = models.BooleanField(default=False)
 
     polartoken = models.CharField(default='',max_length=1000,blank=True,null=True)
@@ -3662,7 +3659,6 @@ class RowerCPForm(ModelForm):
         model = Rower
         fields = ['cprange','kfit','kfatigue']
 
-
 # Form to set rower's Power zones, including test routines
 # to enable consistency
 class RowerHRZonesForm(ModelForm):
@@ -3905,12 +3901,44 @@ class RowerPowerZonesForm(ModelForm):
             trname = cleaned_data['trname']
         except:
             trname = 'TR'
-            cleaned_data['trname'] = 'TR'
+            cleaned_data['ut1name'] = 'TR'
         try:
             anname = cleaned_data['anname']
         except:
             anname = 'AN'
-            cleaned_data['anname'] = 'AN'
+            cleaned_data['ut1name'] = 'AN'
+
+
+        try:
+            ut3name = cleaned_data['ut3name']
+        except:
+            ut2name = 'UT3'
+            cleaned_data['ut3name'] = 'UT3'
+        try:
+            ut2name = cleaned_data['ut2name']
+        except:
+            ut2name = 'UT2'
+            cleaned_data['ut2name'] = 'UT2'
+        try:
+            ut1name = cleaned_data['ut1name']
+        except:
+            ut1name = 'UT1'
+            cleaned_data['ut1name'] = 'UT1'
+        try:
+            atname = cleaned_data['atname']
+        except:
+            atname = 'AT'
+            cleaned_data['atname'] = 'AT'
+        try:
+            trname = cleaned_data['trname']
+        except:
+            trname = 'TR'
+            cleaned_data['ut1name'] = 'TR'
+        try:
+            anname = cleaned_data['anname']
+        except:
+            anname = 'AN'
+            cleaned_data['ut1name'] = 'AN'
 
 
         if pw_ut1 <= pw_ut2: