diff --git a/rowers/alerts.py b/rowers/alerts.py
index 6e9fcd12..9fb3aa21 100644
--- a/rowers/alerts.py
+++ b/rowers/alerts.py
@@ -30,7 +30,8 @@ def create_alert(manager, rower, measured,period=7, emailalert=True,
                   reststrokes=reststrokes,
                   period=period,
                   emailalert=emailalert,
-                  workouttype=workouttype
+                  workouttype=workouttype,
+                  boattype=boattype,
                   )
 
     alert.save()
@@ -95,7 +96,8 @@ def alert_get_stats(alert,nperiod=0):
         columns += condition.metric
 
     workouts = Workout.objects.filter(date__gte=startdate,date__lte=enddate,user=alert.rower,
-                                      workouttype=alert.workouttype,duplicate=False)
+                                      workouttype=alert.workouttype,duplicate=False,
+                                      boattype=alert.boattype)
     ids = [w.id for w in workouts]
 
     df = getsmallrowdata_db(columns,ids=ids,doclean=True,workstrokesonly=workstrokesonly)
diff --git a/rowers/models.py b/rowers/models.py
index 3028d064..9c94ba10 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -1082,6 +1082,8 @@ class Alert(models.Model):
     emailalert = models.BooleanField(default=True,verbose_name='Send email alerts')
     workouttype = models.CharField(choices=rowchoices,max_length=50,
                                    verbose_name='Exercise/Boat Class',default='water')
+    boattype = models.CharField(choices=mytypes.boattypes,max_length=50,
+                                verbose_name='Boat Type',default='1x')
     
 
     def __str__(self):
@@ -1145,7 +1147,7 @@ class Alert(models.Model):
 class AlertEditForm(ModelForm):
     class Meta:
         model = Alert
-        fields = ['name','reststrokes','period','emailalert','workouttype']
+        fields = ['name','reststrokes','period','emailalert','workouttype','boattype']
         widgets = {
             'reststrokes':forms.CheckboxInput()
             }
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index 969eae07..bfec340d 100644
Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 6bb2801c..63fc40a3 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -4370,6 +4370,7 @@ def alert_create_view(request,userid=0):
             emailalert = ad['emailalert']
             reststrokes = ad['reststrokes']
             workouttype = ad['workouttype']
+            boattype = ad['boattype']
             name = ad['name']
 
             filters = []
@@ -4391,6 +4392,7 @@ def alert_create_view(request,userid=0):
 
             result,message = create_alert(request.user,r,measured,period=period,emailalert=emailalert,
                                           reststrokes=reststrokes,workouttype=workouttype,
+                                          boattype=boattype,
                                           filter = filters,
                                           name=name)
 
@@ -4522,6 +4524,7 @@ def alert_edit_view(request,id=0,userid=0):
             emailalert = ad['emailalert']
             reststrokes = ad['reststrokes']
             workouttype = ad['workouttype']
+            boattype = ad['boattype']
             name = ad['name']
 
             m = alert.measured
@@ -4535,6 +4538,7 @@ def alert_edit_view(request,id=0,userid=0):
             alert.emailalert = emailalert
             alert.reststrokes = reststrokes
             alert.workouttype = workouttype
+            alert.boattype = boattype
             alert.name = name
             alert.save()