From 13513d30a547a3eba7ca39d88e5cf1984fe771f5 Mon Sep 17 00:00:00 2001
From: Daniel Cartwright <chessai@fb.com>
Date: Thu, 13 May 2021 13:59:28 -0700
Subject: [PATCH] Regenerate classifiers

Summary: Some classifiers were a bit out of date. They needed regenerating.

Reviewed By: girifb

Differential Revision: D28399234

fbshipit-source-id: 2780dbe5478a5386a2b6062dec8696736b3ce723
---
 Duckling/Ranking/Classifiers/EN_AU.hs | 74 ++++++++++-----------
 Duckling/Ranking/Classifiers/EN_BZ.hs | 74 ++++++++++-----------
 Duckling/Ranking/Classifiers/EN_CA.hs | 74 ++++++++++-----------
 Duckling/Ranking/Classifiers/EN_GB.hs | 74 ++++++++++-----------
 Duckling/Ranking/Classifiers/EN_IE.hs | 74 ++++++++++-----------
 Duckling/Ranking/Classifiers/EN_IN.hs | 74 ++++++++++-----------
 Duckling/Ranking/Classifiers/EN_JM.hs | 74 ++++++++++-----------
 Duckling/Ranking/Classifiers/EN_NZ.hs | 74 ++++++++++-----------
 Duckling/Ranking/Classifiers/EN_PH.hs | 74 ++++++++++-----------
 Duckling/Ranking/Classifiers/EN_TT.hs | 74 ++++++++++-----------
 Duckling/Ranking/Classifiers/EN_US.hs | 96 ++++++++++++++-------------
 Duckling/Ranking/Classifiers/EN_XX.hs | 74 ++++++++++-----------
 Duckling/Ranking/Classifiers/EN_ZA.hs | 74 ++++++++++-----------
 Duckling/Ranking/Classifiers/FR_XX.hs | 50 +++++++-------
 14 files changed, 518 insertions(+), 516 deletions(-)

diff --git a/Duckling/Ranking/Classifiers/EN_AU.hs b/Duckling/Ranking/Classifiers/EN_AU.hs
index 4499d76a..6b3a71d1 100644
--- a/Duckling/Ranking/Classifiers/EN_AU.hs
+++ b/Duckling/Ranking/Classifiers/EN_AU.hs
@@ -96,6 +96,18 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("the nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<duration> hence|ago",
         Classifier{okData =
                      ClassData{prior = -5.406722127027582e-2,
@@ -900,18 +912,6 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
-       ("the nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.6931471805599453),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -0.6931471805599453)],
-                               n = 3},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.3723081191451507, unseen = -2.995732273553991,
@@ -1909,31 +1909,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.916290731874155),
-                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.5257286443082556),
-                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -2.120263536200091),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -1.6094379124341003),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -2.120263536200091)],
-                               n = 9},
-                   koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -1.1786549963416462),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.8718021769015913),
-                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.466337068793427)],
-                               n = 3}}),
        ("<hour-of-day> quarter",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
@@ -2915,6 +2890,31 @@ classifiers
                                     ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
                                      -3.56953269648137)],
                                n = 22}}),
+       ("nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.916290731874155),
+                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
+                                     -2.5257286443082556),
+                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
+                                     -2.120263536200091)],
+                               n = 9},
+                   koData =
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -1.1786549963416462),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
+                                     -1.8718021769015913),
+                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
+                                     -1.466337068793427)],
+                               n = 3}}),
        ("quarter after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1780538303479458,
diff --git a/Duckling/Ranking/Classifiers/EN_BZ.hs b/Duckling/Ranking/Classifiers/EN_BZ.hs
index db62e992..b5076673 100644
--- a/Duckling/Ranking/Classifiers/EN_BZ.hs
+++ b/Duckling/Ranking/Classifiers/EN_BZ.hs
@@ -96,6 +96,18 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("the nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<duration> hence|ago",
         Classifier{okData =
                      ClassData{prior = -5.406722127027582e-2,
@@ -900,18 +912,6 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
-       ("the nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.6931471805599453),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -0.6931471805599453)],
-                               n = 3},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.3723081191451507, unseen = -2.995732273553991,
@@ -1909,31 +1909,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.916290731874155),
-                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.5257286443082556),
-                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -2.120263536200091),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -1.6094379124341003),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -2.120263536200091)],
-                               n = 9},
-                   koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -1.1786549963416462),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.8718021769015913),
-                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.466337068793427)],
-                               n = 3}}),
        ("<hour-of-day> quarter",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
@@ -2915,6 +2890,31 @@ classifiers
                                     ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
                                      -3.56953269648137)],
                                n = 22}}),
+       ("nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.916290731874155),
+                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
+                                     -2.5257286443082556),
+                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
+                                     -2.120263536200091)],
+                               n = 9},
+                   koData =
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -1.1786549963416462),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
+                                     -1.8718021769015913),
+                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
+                                     -1.466337068793427)],
+                               n = 3}}),
        ("quarter after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1780538303479458,
diff --git a/Duckling/Ranking/Classifiers/EN_CA.hs b/Duckling/Ranking/Classifiers/EN_CA.hs
index 819a1570..6ba97917 100644
--- a/Duckling/Ranking/Classifiers/EN_CA.hs
+++ b/Duckling/Ranking/Classifiers/EN_CA.hs
@@ -97,6 +97,18 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("the nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<duration> hence|ago",
         Classifier{okData =
                      ClassData{prior = -5.406722127027582e-2,
@@ -914,18 +926,6 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
-       ("the nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.6931471805599453),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -0.6931471805599453)],
-                               n = 3},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.3723081191451507, unseen = -2.995732273553991,
@@ -1969,31 +1969,6 @@ classifiers
                      ClassData{prior = -1.3862943611198906,
                                unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
-       ("nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.916290731874155),
-                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.5257286443082556),
-                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -2.120263536200091),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -1.6094379124341003),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -2.120263536200091)],
-                               n = 9},
-                   koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -1.1786549963416462),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.8718021769015913),
-                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.466337068793427)],
-                               n = 3}}),
        ("<hour-of-day> quarter",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
@@ -3025,6 +3000,31 @@ classifiers
                                     ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
                                      -3.56953269648137)],
                                n = 22}}),
+       ("nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.916290731874155),
+                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
+                                     -2.5257286443082556),
+                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
+                                     -2.120263536200091)],
+                               n = 9},
+                   koData =
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -1.1786549963416462),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
+                                     -1.8718021769015913),
+                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
+                                     -1.466337068793427)],
+                               n = 3}}),
        ("quarter after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1780538303479458,
diff --git a/Duckling/Ranking/Classifiers/EN_GB.hs b/Duckling/Ranking/Classifiers/EN_GB.hs
index 707d208c..c2b15452 100644
--- a/Duckling/Ranking/Classifiers/EN_GB.hs
+++ b/Duckling/Ranking/Classifiers/EN_GB.hs
@@ -96,6 +96,18 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("the nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<duration> hence|ago",
         Classifier{okData =
                      ClassData{prior = -5.406722127027582e-2,
@@ -907,18 +919,6 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
-       ("the nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.6931471805599453),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -0.6931471805599453)],
-                               n = 3},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.3723081191451507, unseen = -2.995732273553991,
@@ -1944,31 +1944,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.916290731874155),
-                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.5257286443082556),
-                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -2.120263536200091),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -1.6094379124341003),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -2.120263536200091)],
-                               n = 9},
-                   koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -1.1786549963416462),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.8718021769015913),
-                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.466337068793427)],
-                               n = 3}}),
        ("<hour-of-day> quarter",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
@@ -2971,6 +2946,31 @@ classifiers
                                     ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
                                      -3.56953269648137)],
                                n = 22}}),
+       ("nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.916290731874155),
+                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
+                                     -2.5257286443082556),
+                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
+                                     -2.120263536200091)],
+                               n = 9},
+                   koData =
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -1.1786549963416462),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
+                                     -1.8718021769015913),
+                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
+                                     -1.466337068793427)],
+                               n = 3}}),
        ("quarter after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1780538303479458,
diff --git a/Duckling/Ranking/Classifiers/EN_IE.hs b/Duckling/Ranking/Classifiers/EN_IE.hs
index c16287da..0e630135 100644
--- a/Duckling/Ranking/Classifiers/EN_IE.hs
+++ b/Duckling/Ranking/Classifiers/EN_IE.hs
@@ -96,6 +96,18 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("the nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<duration> hence|ago",
         Classifier{okData =
                      ClassData{prior = -5.406722127027582e-2,
@@ -900,18 +912,6 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
-       ("the nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.6931471805599453),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -0.6931471805599453)],
-                               n = 3},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.3723081191451507, unseen = -2.995732273553991,
@@ -1909,31 +1909,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.916290731874155),
-                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.5257286443082556),
-                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -2.120263536200091),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -1.6094379124341003),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -2.120263536200091)],
-                               n = 9},
-                   koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -1.1786549963416462),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.8718021769015913),
-                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.466337068793427)],
-                               n = 3}}),
        ("<hour-of-day> quarter",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
@@ -2915,6 +2890,31 @@ classifiers
                                     ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
                                      -3.56953269648137)],
                                n = 22}}),
+       ("nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.916290731874155),
+                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
+                                     -2.5257286443082556),
+                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
+                                     -2.120263536200091)],
+                               n = 9},
+                   koData =
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -1.1786549963416462),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
+                                     -1.8718021769015913),
+                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
+                                     -1.466337068793427)],
+                               n = 3}}),
        ("quarter after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1780538303479458,
diff --git a/Duckling/Ranking/Classifiers/EN_IN.hs b/Duckling/Ranking/Classifiers/EN_IN.hs
index fd484964..5e6fd61b 100644
--- a/Duckling/Ranking/Classifiers/EN_IN.hs
+++ b/Duckling/Ranking/Classifiers/EN_IN.hs
@@ -96,6 +96,18 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("the nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<duration> hence|ago",
         Classifier{okData =
                      ClassData{prior = -5.406722127027582e-2,
@@ -900,18 +912,6 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
-       ("the nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.6931471805599453),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -0.6931471805599453)],
-                               n = 3},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.3723081191451507, unseen = -2.995732273553991,
@@ -1909,31 +1909,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.916290731874155),
-                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.5257286443082556),
-                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -2.120263536200091),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -1.6094379124341003),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -2.120263536200091)],
-                               n = 9},
-                   koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -1.1786549963416462),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.8718021769015913),
-                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.466337068793427)],
-                               n = 3}}),
        ("<hour-of-day> quarter",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
@@ -2915,6 +2890,31 @@ classifiers
                                     ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
                                      -3.56953269648137)],
                                n = 22}}),
+       ("nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.916290731874155),
+                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
+                                     -2.5257286443082556),
+                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
+                                     -2.120263536200091)],
+                               n = 9},
+                   koData =
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -1.1786549963416462),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
+                                     -1.8718021769015913),
+                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
+                                     -1.466337068793427)],
+                               n = 3}}),
        ("quarter after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1780538303479458,
diff --git a/Duckling/Ranking/Classifiers/EN_JM.hs b/Duckling/Ranking/Classifiers/EN_JM.hs
index bb484d2a..64440b25 100644
--- a/Duckling/Ranking/Classifiers/EN_JM.hs
+++ b/Duckling/Ranking/Classifiers/EN_JM.hs
@@ -96,6 +96,18 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("the nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<duration> hence|ago",
         Classifier{okData =
                      ClassData{prior = -5.406722127027582e-2,
@@ -900,18 +912,6 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
-       ("the nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.6931471805599453),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -0.6931471805599453)],
-                               n = 3},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.3723081191451507, unseen = -2.995732273553991,
@@ -1909,31 +1909,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.916290731874155),
-                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.5257286443082556),
-                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -2.120263536200091),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -1.6094379124341003),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -2.120263536200091)],
-                               n = 9},
-                   koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -1.1786549963416462),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.8718021769015913),
-                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.466337068793427)],
-                               n = 3}}),
        ("<hour-of-day> quarter",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
@@ -2915,6 +2890,31 @@ classifiers
                                     ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
                                      -3.56953269648137)],
                                n = 22}}),
+       ("nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.916290731874155),
+                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
+                                     -2.5257286443082556),
+                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
+                                     -2.120263536200091)],
+                               n = 9},
+                   koData =
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -1.1786549963416462),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
+                                     -1.8718021769015913),
+                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
+                                     -1.466337068793427)],
+                               n = 3}}),
        ("quarter after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1780538303479458,
diff --git a/Duckling/Ranking/Classifiers/EN_NZ.hs b/Duckling/Ranking/Classifiers/EN_NZ.hs
index 67ed0de1..97bca8ed 100644
--- a/Duckling/Ranking/Classifiers/EN_NZ.hs
+++ b/Duckling/Ranking/Classifiers/EN_NZ.hs
@@ -96,6 +96,18 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("the nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<duration> hence|ago",
         Classifier{okData =
                      ClassData{prior = -5.406722127027582e-2,
@@ -900,18 +912,6 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
-       ("the nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.6931471805599453),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -0.6931471805599453)],
-                               n = 3},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.3723081191451507, unseen = -2.995732273553991,
@@ -1909,31 +1909,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.916290731874155),
-                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.5257286443082556),
-                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -2.120263536200091),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -1.6094379124341003),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -2.120263536200091)],
-                               n = 9},
-                   koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -1.1786549963416462),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.8718021769015913),
-                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.466337068793427)],
-                               n = 3}}),
        ("<hour-of-day> quarter",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
@@ -2915,6 +2890,31 @@ classifiers
                                     ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
                                      -3.56953269648137)],
                                n = 22}}),
+       ("nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.916290731874155),
+                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
+                                     -2.5257286443082556),
+                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
+                                     -2.120263536200091)],
+                               n = 9},
+                   koData =
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -1.1786549963416462),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
+                                     -1.8718021769015913),
+                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
+                                     -1.466337068793427)],
+                               n = 3}}),
        ("quarter after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1780538303479458,
diff --git a/Duckling/Ranking/Classifiers/EN_PH.hs b/Duckling/Ranking/Classifiers/EN_PH.hs
index a1555fae..d786cd56 100644
--- a/Duckling/Ranking/Classifiers/EN_PH.hs
+++ b/Duckling/Ranking/Classifiers/EN_PH.hs
@@ -96,6 +96,18 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("the nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<duration> hence|ago",
         Classifier{okData =
                      ClassData{prior = -5.406722127027582e-2,
@@ -900,18 +912,6 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
-       ("the nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.6931471805599453),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -0.6931471805599453)],
-                               n = 3},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.3723081191451507, unseen = -2.995732273553991,
@@ -1909,31 +1909,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.916290731874155),
-                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.5257286443082556),
-                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -2.120263536200091),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -1.6094379124341003),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -2.120263536200091)],
-                               n = 9},
-                   koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -1.1786549963416462),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.8718021769015913),
-                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.466337068793427)],
-                               n = 3}}),
        ("<hour-of-day> quarter",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
@@ -2915,6 +2890,31 @@ classifiers
                                     ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
                                      -3.56953269648137)],
                                n = 22}}),
+       ("nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.916290731874155),
+                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
+                                     -2.5257286443082556),
+                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
+                                     -2.120263536200091)],
+                               n = 9},
+                   koData =
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -1.1786549963416462),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
+                                     -1.8718021769015913),
+                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
+                                     -1.466337068793427)],
+                               n = 3}}),
        ("quarter after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1780538303479458,
diff --git a/Duckling/Ranking/Classifiers/EN_TT.hs b/Duckling/Ranking/Classifiers/EN_TT.hs
index 3981635b..924dc360 100644
--- a/Duckling/Ranking/Classifiers/EN_TT.hs
+++ b/Duckling/Ranking/Classifiers/EN_TT.hs
@@ -96,6 +96,18 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("the nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<duration> hence|ago",
         Classifier{okData =
                      ClassData{prior = -5.406722127027582e-2,
@@ -900,18 +912,6 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
-       ("the nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.6931471805599453),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -0.6931471805599453)],
-                               n = 3},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.3723081191451507, unseen = -2.995732273553991,
@@ -1909,31 +1909,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.916290731874155),
-                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.5257286443082556),
-                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -2.120263536200091),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -1.6094379124341003),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -2.120263536200091)],
-                               n = 9},
-                   koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -1.1786549963416462),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.8718021769015913),
-                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.466337068793427)],
-                               n = 3}}),
        ("<hour-of-day> quarter",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
@@ -2915,6 +2890,31 @@ classifiers
                                     ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
                                      -3.56953269648137)],
                                n = 22}}),
+       ("nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.916290731874155),
+                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
+                                     -2.5257286443082556),
+                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
+                                     -2.120263536200091)],
+                               n = 9},
+                   koData =
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -1.1786549963416462),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
+                                     -1.8718021769015913),
+                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
+                                     -1.466337068793427)],
+                               n = 3}}),
        ("quarter after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1780538303479458,
diff --git a/Duckling/Ranking/Classifiers/EN_US.hs b/Duckling/Ranking/Classifiers/EN_US.hs
index 3d0267ec..a59f95fa 100644
--- a/Duckling/Ranking/Classifiers/EN_US.hs
+++ b/Duckling/Ranking/Classifiers/EN_US.hs
@@ -103,6 +103,21 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("the nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -1.0986122886681098),
+                                    ("dayyear", -1.791759469228055),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.0986122886681098),
+                                    ("ordinals (first..twentieth,thirtieth,...)Sundayyear (latent)",
+                                     -1.791759469228055)],
+                               n = 4},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<duration> hence|ago",
         Classifier{okData =
                      ClassData{prior = -0.10008345855698253,
@@ -930,21 +945,6 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
-       ("the nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -1.0986122886681098),
-                                    ("dayyear", -1.791759469228055),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -1.0986122886681098),
-                                    ("ordinals (first..twentieth,thirtieth,...)Sundayyear (latent)",
-                                     -1.791759469228055)],
-                               n = 4},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.3723081191451507, unseen = -2.995732273553991,
@@ -2041,34 +2041,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.3677247801253174, unseen = -3.332204510175204,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.9932517730102834),
-                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.6026896854443837),
-                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -2.1972245773362196),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -1.6863989535702288),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -2.1972245773362196)],
-                               n = 9},
-                   koData =
-                     ClassData{prior = -1.1786549963416462, unseen = -2.890371757896165,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -1.4469189829363254),
-                                    ("dayyear", -2.1400661634962708),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -2.1400661634962708),
-                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.7346010553881064),
-                                    ("ordinals (first..twentieth,thirtieth,...)Sundayyear (latent)",
-                                     -2.1400661634962708)],
-                               n = 4}}),
        ("National Grandparents Day",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -3131,6 +3103,34 @@ classifiers
                                     ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
                                      -3.56953269648137)],
                                n = 22}}),
+       ("nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = -0.3677247801253174, unseen = -3.332204510175204,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.9932517730102834),
+                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
+                                     -2.6026896854443837),
+                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
+                                     -2.1972245773362196),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6863989535702288),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
+                                     -2.1972245773362196)],
+                               n = 9},
+                   koData =
+                     ClassData{prior = -1.1786549963416462, unseen = -2.890371757896165,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -1.4469189829363254),
+                                    ("dayyear", -2.1400661634962708),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
+                                     -2.1400661634962708),
+                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
+                                     -1.7346010553881064),
+                                    ("ordinals (first..twentieth,thirtieth,...)Sundayyear (latent)",
+                                     -2.1400661634962708)],
+                               n = 4}}),
        ("quarter after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1780538303479458,
@@ -3648,9 +3648,9 @@ classifiers
                                unseen = -3.4657359027997265,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinals (first..twentieth,thirtieth,...)Monday<named-month>|<named-day> <day-of-month> (ordinal)",
+                                   [("ordinals (first..twentieth,thirtieth,...)Super Tuesdaythe nth <day-of-week> of <month-or-greater>",
                                      -2.740840023925201),
-                                    ("ordinals (first..twentieth,thirtieth,...)Super Tuesdaythe nth <time> of <time>",
+                                    ("ordinals (first..twentieth,thirtieth,...)Monday<named-month>|<named-day> <day-of-month> (ordinal)",
                                      -2.740840023925201),
                                     ("ordinals (first..twentieth,thirtieth,...)Christmastoday",
                                      -2.740840023925201),
@@ -3804,6 +3804,8 @@ classifiers
                                     ("dayhour", -4.867534450455582),
                                     ("daymonth", -3.6147714819602146),
                                     ("Super TuesdayMarch", -4.867534450455582),
+                                    ("Tuesdaythe nth <day-of-week> of <month-or-greater>",
+                                     -4.867534450455582),
                                     ("Tuesdaythe <day-of-month> (ordinal)", -4.867534450455582),
                                     ("from|since|after <time><day-of-month> (ordinal or number) of <month>",
                                      -3.951243718581427),
@@ -3825,6 +3827,8 @@ classifiers
                                     ("Super Tuesdayintersect by \",\", \"of\", \"from\" for year",
                                      -4.462069342347418),
                                     ("hourminute", -4.867534450455582),
+                                    ("Super Tuesdaythe nth <day-of-week> of <month-or-greater>",
+                                     -4.867534450455582),
                                     ("TuesdayMarch", -4.867534450455582),
                                     ("minutehour", -3.951243718581427),
                                     ("<time> timezonehh:mm", -4.867534450455582),
@@ -3853,7 +3857,6 @@ classifiers
                                     ("<time-of-day> am|pmhh:mm", -4.867534450455582),
                                     ("Tuesday<named-month> <day-of-month> (non ordinal)",
                                      -4.867534450455582),
-                                    ("Super Tuesdaythe nth <time> of <time>", -4.867534450455582),
                                     ("from|since|after <time>the <day-of-month> (ordinal or number) of <named-month>",
                                      -3.3634570536793085),
                                     ("the <day-of-month> (ordinal)<day-of-month> (ordinal or number) <named-month>",
@@ -3868,7 +3871,6 @@ classifiers
                                     ("Super Tuesdaythe <day-of-month> (ordinal)",
                                      -4.867534450455582),
                                     ("Tuesdayintersect", -4.462069342347418),
-                                    ("Tuesdaythe nth <time> of <time>", -4.867534450455582),
                                     ("the <day-of-month> (ordinal)intersect", -4.462069342347418)],
                                n = 99}}),
        ("Tuesday",
diff --git a/Duckling/Ranking/Classifiers/EN_XX.hs b/Duckling/Ranking/Classifiers/EN_XX.hs
index c8e4c5fb..0e45c3de 100644
--- a/Duckling/Ranking/Classifiers/EN_XX.hs
+++ b/Duckling/Ranking/Classifiers/EN_XX.hs
@@ -96,6 +96,18 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("the nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<duration> hence|ago",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836,
@@ -902,18 +914,6 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
-       ("the nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.6931471805599453),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -0.6931471805599453)],
-                               n = 3},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.4000876832522264, unseen = -2.995732273553991,
@@ -1921,31 +1921,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.916290731874155),
-                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.5257286443082556),
-                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -2.120263536200091),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -1.6094379124341003),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -2.120263536200091)],
-                               n = 9},
-                   koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -1.1786549963416462),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.8718021769015913),
-                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.466337068793427)],
-                               n = 3}}),
        ("<hour-of-day> quarter",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
@@ -2937,6 +2912,31 @@ classifiers
                                      -3.6109179126442243),
                                     ("<integer> <unit-of-duration>now", -3.6109179126442243)],
                                n = 23}}),
+       ("nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.916290731874155),
+                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
+                                     -2.5257286443082556),
+                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
+                                     -2.120263536200091)],
+                               n = 9},
+                   koData =
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -1.1786549963416462),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
+                                     -1.8718021769015913),
+                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
+                                     -1.466337068793427)],
+                               n = 3}}),
        ("quarter after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1780538303479458,
diff --git a/Duckling/Ranking/Classifiers/EN_ZA.hs b/Duckling/Ranking/Classifiers/EN_ZA.hs
index 516e1891..1c99cfd9 100644
--- a/Duckling/Ranking/Classifiers/EN_ZA.hs
+++ b/Duckling/Ranking/Classifiers/EN_ZA.hs
@@ -96,6 +96,18 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("the nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<duration> hence|ago",
         Classifier{okData =
                      ClassData{prior = -5.406722127027582e-2,
@@ -900,18 +912,6 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
-       ("the nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.6931471805599453),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -0.6931471805599453)],
-                               n = 3},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.3723081191451507, unseen = -2.995732273553991,
@@ -1909,31 +1909,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -0.916290731874155),
-                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.5257286443082556),
-                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -2.120263536200091),
-                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
-                                     -1.6094379124341003),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -2.120263536200091)],
-                               n = 9},
-                   koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -1.1786549963416462),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.8718021769015913),
-                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.466337068793427)],
-                               n = 3}}),
        ("<hour-of-day> quarter",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
@@ -2915,6 +2890,31 @@ classifiers
                                     ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
                                      -3.56953269648137)],
                                n = 22}}),
+       ("nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.916290731874155),
+                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
+                                     -2.5257286443082556),
+                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
+                                     -2.120263536200091)],
+                               n = 9},
+                   koData =
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -1.1786549963416462),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
+                                     -1.8718021769015913),
+                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
+                                     -1.466337068793427)],
+                               n = 3}}),
        ("quarter after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1780538303479458,
diff --git a/Duckling/Ranking/Classifiers/FR_XX.hs b/Duckling/Ranking/Classifiers/FR_XX.hs
index 3545ab9c..3ac3ae26 100644
--- a/Duckling/Ranking/Classifiers/FR_XX.hs
+++ b/Duckling/Ranking/Classifiers/FR_XX.hs
@@ -160,6 +160,18 @@ classifiers
                      ClassData{prior = -0.9740495660263475,
                                unseen = -5.0106352940962555,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 148}}),
+       ("the nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("ordinals (premier..seizieme)Mercredi<cycle> prochain|suivant|d'apr\232s",
+                                     -0.6931471805599453),
+                                    ("daymonth", -0.6931471805599453)],
+                               n = 1},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<named-month>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -514,18 +526,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("the nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("ordinals (premier..seizieme)Mercredi<cycle> prochain|suivant|d'apr\232s",
-                                     -0.6931471805599453),
-                                    ("daymonth", -0.6931471805599453)],
-                               n = 1},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("de <datetime> - <datetime> (interval)",
         Classifier{okData =
                      ClassData{prior = -1.0560526742493137,
@@ -1182,18 +1182,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("nth <time> of <time>",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("ordinals (premier..seizieme)Mercredi<cycle> prochain|suivant|d'apr\232s",
-                                     -0.6931471805599453),
-                                    ("daymonth", -0.6931471805599453)],
-                               n = 2},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("Mardi",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.833213344056216,
@@ -1951,6 +1939,18 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("nth <day-of-week> of <month-or-greater>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("ordinals (premier..seizieme)Mercredi<cycle> prochain|suivant|d'apr\232s",
+                                     -0.6931471805599453),
+                                    ("daymonth", -0.6931471805599453)],
+                               n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("Mars",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.332204510175204,
@@ -2465,12 +2465,12 @@ classifiers
                                     ("intersect", -2.238406867302635),
                                     ("soir de no\235l", -5.156177599386914),
                                     ("en semaine", -3.4514295071484886),
-                                    ("nth <time> of <time>", -5.156177599386914),
                                     ("toussaint", -4.750712491278749), ("day", -1.2954478883463185),
                                     ("deuxi\232me quinzaine de <named-month>(interval)",
                                      -5.156177599386914),
                                     ("<dim time> <part-of-day>", -3.2102674503316004),
                                     ("dd/-mm", -3.903414630891546),
+                                    ("nth <day-of-week> of <month-or-greater>", -5.156177599386914),
                                     ("dd/-mm/-yyyy", -4.4630304188269685),
                                     ("dd mm yyyy", -3.903414630891546),
                                     ("day of month (premier)", -3.903414630891546),