diff --git a/solve.py b/solve.py
index 5289a2d..bf13a72 100755
--- a/solve.py
+++ b/solve.py
@@ -3,27 +3,26 @@ import sys
 import re
 
 num_values = dict(
-    one="1",
-    two="2",
-    three="3",
+    on="1",
+    tw="2",
+    thre="3",
     four="4",
-    five="5",
+    fiv="5",
     six="6",
-    seven="7",
-    eight="8",
-    nine="9",
+    seve="7",
+    eigh="8",
+    nin="9",
 )
 
-patterns = "one two three four five six seven eight nine 1 2 3 4 5 6 7 8 9".split()
+nums_re = r"on(?=e)|tw(?=o)|thre(?=e)|four|fiv(?=e)|six|seve(?=n)|eigh(?=t)|nin(?=e)|1|2|3|4|5|6|7|8|9"
 
 sum = 0
 for line in sys.stdin:
     first = len(line)
     last = 0
     nums = []
-    for pat in patterns:
-        for m in re.finditer(pat, line):
-            nums.append((m.start(), pat))
+    for m in re.finditer(nums_re, line):
+        nums.append((m.start(), m.group(0)))
 
     nums.sort()
     first_word = nums[0][1]