diff --git a/plan.json b/plan.json
index 762eb68..b7a291c 100644
--- a/plan.json
+++ b/plan.json
@@ -71,21 +71,6 @@
                 "breed_for": [],
                 "Any": 2
             },
-            "0025-01-000": {
-                "representative": "0025-01-000-1",
-                "catch_count": 4,
-                "evolve_to": [
-                    "0025-01-000-1",
-                    "0026-01-000-1",
-                    "0025-01-000-2",
-                    "0026-01-000-2"
-                ],
-                "breed_for": [
-                    "0172-02-000-1"
-                ],
-                "Male": 2,
-                "Female": 2
-            },
             "0027-01-000": {
                 "representative": "0027-01-000-1",
                 "catch_count": 2,
@@ -118,30 +103,6 @@
                 "breed_for": [],
                 "Any": 3
             },
-            "0035-01-000": {
-                "representative": "0035-01-000-1",
-                "catch_count": 2,
-                "evolve_to": [
-                    "0035-01-000-1",
-                    "0036-01-000-1"
-                ],
-                "breed_for": [
-                    "0173-02-000-1"
-                ],
-                "Any": 2
-            },
-            "0039-01-000": {
-                "representative": "0039-01-000-1",
-                "catch_count": 2,
-                "evolve_to": [
-                    "0039-01-000-1",
-                    "0040-01-000-1"
-                ],
-                "breed_for": [
-                    "0174-02-000-1"
-                ],
-                "Any": 2
-            },
             "0041-01-000": {
                 "representative": "0041-01-000-1",
                 "catch_count": 5,
@@ -498,16 +459,6 @@
                 "Male": 2,
                 "Female": 2
             },
-            "0113-01-000": {
-                "representative": "0113-01-000-2",
-                "catch_count": 2,
-                "evolve_to": [
-                    "0113-01-000-2",
-                    "0242-02-000-2"
-                ],
-                "breed_for": [],
-                "Any": 2
-            },
             "0114-01-000": {
                 "representative": "0114-01-000-1",
                 "catch_count": 1,
@@ -560,15 +511,6 @@
                 "breed_for": [],
                 "Any": 2
             },
-            "0122-01-000": {
-                "representative": "0122-01-000-1",
-                "catch_count": 1,
-                "evolve_to": [
-                    "0122-01-000-1"
-                ],
-                "breed_for": [],
-                "Any": 1
-            },
             "0123-01-000": {
                 "representative": "0123-01-000-1",
                 "catch_count": 4,
@@ -582,39 +524,6 @@
                 "Male": 2,
                 "Female": 2
             },
-            "0124-01-000": {
-                "representative": "0124-01-000-2",
-                "catch_count": 1,
-                "evolve_to": [
-                    "0124-01-000-2"
-                ],
-                "breed_for": [
-                    "0238-02-000-2"
-                ],
-                "Any": 1
-            },
-            "0125-01-000": {
-                "representative": "0125-01-000-1",
-                "catch_count": 1,
-                "evolve_to": [
-                    "0125-01-000-1"
-                ],
-                "breed_for": [
-                    "0239-02-000-1"
-                ],
-                "Any": 1
-            },
-            "0126-01-000": {
-                "representative": "0126-01-000-1",
-                "catch_count": 1,
-                "evolve_to": [
-                    "0126-01-000-1"
-                ],
-                "breed_for": [
-                    "0240-02-000-1"
-                ],
-                "Any": 1
-            },
             "0127-01-000": {
                 "representative": "0127-01-000-1",
                 "catch_count": 1,
@@ -700,15 +609,6 @@
                 "breed_for": [],
                 "Any": 1
             },
-            "0143-01-000": {
-                "representative": "0143-01-000-1",
-                "catch_count": 1,
-                "evolve_to": [
-                    "0143-01-000-1"
-                ],
-                "breed_for": [],
-                "Any": 1
-            },
             "0147-01-000": {
                 "representative": "0147-01-000-1",
                 "catch_count": 3,
@@ -809,6 +709,43 @@
                 "breed_for": [],
                 "Any": 2
             },
+            "0172-02-000": {
+                "representative": "0172-02-000-1",
+                "catch_count": 5,
+                "evolve_to": [
+                    "0025-01-000-1",
+                    "0026-01-000-1",
+                    "0172-02-000-1",
+                    "0025-01-000-2",
+                    "0026-01-000-2"
+                ],
+                "breed_for": [],
+                "Any": 1,
+                "Male": 2,
+                "Female": 2
+            },
+            "0173-02-000": {
+                "representative": "0173-02-000-1",
+                "catch_count": 3,
+                "evolve_to": [
+                    "0035-01-000-1",
+                    "0036-01-000-1",
+                    "0173-02-000-1"
+                ],
+                "breed_for": [],
+                "Any": 3
+            },
+            "0174-02-000": {
+                "representative": "0174-02-000-1",
+                "catch_count": 3,
+                "evolve_to": [
+                    "0039-01-000-1",
+                    "0040-01-000-1",
+                    "0174-02-000-1"
+                ],
+                "breed_for": [],
+                "Any": 3
+            },
             "0175-02-000": {
                 "representative": "0175-02-000-1",
                 "catch_count": 2,
@@ -817,7 +754,7 @@
                     "0176-02-000-1"
                 ],
                 "breed_for": [],
-                "Male": 2
+                "Any": 2
             },
             "0177-02-000": {
                 "representative": "0177-02-000-1",
@@ -832,25 +769,6 @@
                 "Male": 1,
                 "Female": 1
             },
-            "0183-02-000": {
-                "representative": "0183-02-000-1",
-                "catch_count": 2,
-                "evolve_to": [
-                    "0183-02-000-1",
-                    "0184-02-000-1"
-                ],
-                "breed_for": [],
-                "Any": 2
-            },
-            "0185-02-000": {
-                "representative": "0185-02-000-1",
-                "catch_count": 1,
-                "evolve_to": [
-                    "0185-02-000-1"
-                ],
-                "breed_for": [],
-                "Male": 1
-            },
             "0187-02-000": {
                 "representative": "0187-02-000-1",
                 "catch_count": 3,
@@ -1177,15 +1095,6 @@
                 "breed_for": [],
                 "Any": 1
             },
-            "0202-02-000": {
-                "representative": "0202-02-000-1",
-                "catch_count": 1,
-                "evolve_to": [
-                    "0202-02-000-1"
-                ],
-                "breed_for": [],
-                "Male": 1
-            },
             "0204-02-000": {
                 "representative": "0204-02-000-1",
                 "catch_count": 2,
@@ -1320,15 +1229,6 @@
                 "breed_for": [],
                 "Any": 1
             },
-            "0226-02-000": {
-                "representative": "0226-02-000-1",
-                "catch_count": 1,
-                "evolve_to": [
-                    "0226-02-000-1"
-                ],
-                "breed_for": [],
-                "Any": 1
-            },
             "0227-02-000": {
                 "representative": "0227-02-000-1",
                 "catch_count": 1,
@@ -1392,7 +1292,37 @@
                     "0237-02-000-1"
                 ],
                 "breed_for": [],
-                "Male": 4
+                "Any": 4
+            },
+            "0238-02-000": {
+                "representative": "0238-02-000-2",
+                "catch_count": 2,
+                "evolve_to": [
+                    "0124-01-000-2",
+                    "0238-02-000-2"
+                ],
+                "breed_for": [],
+                "Any": 2
+            },
+            "0239-02-000": {
+                "representative": "0239-02-000-1",
+                "catch_count": 2,
+                "evolve_to": [
+                    "0125-01-000-1",
+                    "0239-02-000-1"
+                ],
+                "breed_for": [],
+                "Any": 2
+            },
+            "0240-02-000": {
+                "representative": "0240-02-000-1",
+                "catch_count": 2,
+                "evolve_to": [
+                    "0126-01-000-1",
+                    "0240-02-000-1"
+                ],
+                "breed_for": [],
+                "Any": 2
             },
             "0241-02-000": {
                 "representative": "0241-02-000-2",
@@ -1468,23 +1398,74 @@
                 "breed_for": [],
                 "Any": 1
             },
+            "0298-03-000": {
+                "representative": "0298-03-000-1",
+                "catch_count": 2,
+                "evolve_to": [
+                    "0183-02-000-1",
+                    "0184-02-000-1"
+                ],
+                "breed_for": [],
+                "Any": 2
+            },
             "0360-03-000": {
-                "representative": "0360-03-000-2",
-                "catch_count": 1,
+                "representative": "0360-03-000-1",
+                "catch_count": 2,
                 "evolve_to": [
+                    "0202-02-000-1",
                     "0202-02-000-2"
                 ],
                 "breed_for": [],
+                "Male": 1,
                 "Female": 1
             },
             "0438-04-000": {
-                "representative": "0438-04-000-2",
-                "catch_count": 1,
+                "representative": "0438-04-000-1",
+                "catch_count": 2,
                 "evolve_to": [
+                    "0185-02-000-1",
                     "0185-02-000-2"
                 ],
                 "breed_for": [],
+                "Male": 1,
                 "Female": 1
+            },
+            "0439-04-000": {
+                "representative": "0439-04-000-1",
+                "catch_count": 1,
+                "evolve_to": [
+                    "0122-01-000-1"
+                ],
+                "breed_for": [],
+                "Any": 1
+            },
+            "0440-04-000": {
+                "representative": "0440-04-000-2",
+                "catch_count": 2,
+                "evolve_to": [
+                    "0113-01-000-2",
+                    "0242-02-000-2"
+                ],
+                "breed_for": [],
+                "Any": 2
+            },
+            "0446-04-000": {
+                "representative": "0446-04-000-1",
+                "catch_count": 1,
+                "evolve_to": [
+                    "0143-01-000-1"
+                ],
+                "breed_for": [],
+                "Any": 1
+            },
+            "0458-04-000": {
+                "representative": "0458-04-000-1",
+                "catch_count": 1,
+                "evolve_to": [
+                    "0226-02-000-1"
+                ],
+                "breed_for": [],
+                "Any": 1
             }
         }
     },
@@ -1759,7 +1740,7 @@
                     "0467-04-000-1"
                 ],
                 "breed_for": [],
-                "Male": 1
+                "Any": 1
             },
             "0270-03-000": {
                 "representative": "0270-03-000-1",
@@ -1851,6 +1832,15 @@
                 "breed_for": [],
                 "Any": 2
             },
+            "0298-03-000": {
+                "representative": "0298-03-000-1",
+                "catch_count": 1,
+                "evolve_to": [
+                    "0298-03-000-1"
+                ],
+                "breed_for": [],
+                "Any": 1
+            },
             "0299-03-000": {
                 "representative": "0299-03-000-1",
                 "catch_count": 2,
@@ -1922,18 +1912,6 @@
                 "breed_for": [],
                 "Any": 1
             },
-            "0315-03-000": {
-                "representative": "0315-03-000-1",
-                "catch_count": 2,
-                "evolve_to": [
-                    "0315-03-000-1",
-                    "0407-04-000-1"
-                ],
-                "breed_for": [
-                    "0406-04-000-1"
-                ],
-                "Male": 2
-            },
             "0316-03-000": {
                 "representative": "0316-03-000-1",
                 "catch_count": 4,
@@ -2163,7 +2141,7 @@
                     "0360-03-000-1"
                 ],
                 "breed_for": [],
-                "Male": 1
+                "Any": 1
             },
             "0363-03-000": {
                 "representative": "0363-03-000-1",
@@ -2279,13 +2257,18 @@
                 "Female": 2
             },
             "0406-04-000": {
-                "representative": "0406-04-000-2",
-                "catch_count": 2,
+                "representative": "0406-04-000-1",
+                "catch_count": 5,
                 "evolve_to": [
+                    "0315-03-000-1",
+                    "0406-04-000-1",
+                    "0407-04-000-1",
                     "0315-03-000-2",
                     "0407-04-000-2"
                 ],
                 "breed_for": [],
+                "Any": 1,
+                "Male": 2,
                 "Female": 2
             },
             "0408-04-000": {
@@ -2385,6 +2368,15 @@
                 "breed_for": [],
                 "Any": 2
             },
+            "0438-04-000": {
+                "representative": "0438-04-000-1",
+                "catch_count": 1,
+                "evolve_to": [
+                    "0438-04-000-1"
+                ],
+                "breed_for": [],
+                "Any": 1
+            },
             "0440-04-000": {
                 "representative": "0440-04-000-2",
                 "catch_count": 1,
@@ -2392,7 +2384,7 @@
                     "0440-04-000-2"
                 ],
                 "breed_for": [],
-                "Female": 1
+                "Any": 1
             },
             "0441-04-000": {
                 "representative": "0441-04-000-1",
@@ -2425,7 +2417,7 @@
                     "0446-04-000-1"
                 ],
                 "breed_for": [],
-                "Male": 1
+                "Any": 1
             },
             "0447-04-000": {
                 "representative": "0447-04-000-1",
@@ -2435,7 +2427,7 @@
                     "0448-04-000-1"
                 ],
                 "breed_for": [],
-                "Male": 2
+                "Any": 2
             },
             "0449-04-000": {
                 "representative": "0449-04-000-1",
@@ -2495,6 +2487,15 @@
                 "Male": 2,
                 "Female": 2
             },
+            "0458-04-000": {
+                "representative": "0458-04-000-1",
+                "catch_count": 1,
+                "evolve_to": [
+                    "0458-04-000-1"
+                ],
+                "breed_for": [],
+                "Any": 1
+            },
             "0479-04-000": {
                 "representative": "0479-04-000-0",
                 "catch_count": 1,
@@ -3382,15 +3383,6 @@
                 "Male": 1,
                 "Female": 1
             },
-            "0125-01-000": {
-                "representative": "0125-01-000-1",
-                "catch_count": 1,
-                "evolve_to": [
-                    "0466-04-000-1"
-                ],
-                "breed_for": [],
-                "Any": 1
-            },
             "0137-01-000": {
                 "representative": "0137-01-000-0",
                 "catch_count": 1,
@@ -3407,7 +3399,16 @@
                     "0468-04-000-1"
                 ],
                 "breed_for": [],
-                "Male": 1
+                "Any": 1
+            },
+            "0239-02-000": {
+                "representative": "0239-02-000-1",
+                "catch_count": 1,
+                "evolve_to": [
+                    "0466-04-000-1"
+                ],
+                "breed_for": [],
+                "Any": 1
             },
             "0261-03-000": {
                 "representative": "0261-03-000-1",
@@ -3559,17 +3560,6 @@
                 "breed_for": [],
                 "Any": 3
             },
-            "0358-03-000": {
-                "representative": "0358-03-000-1",
-                "catch_count": 1,
-                "evolve_to": [
-                    "0358-03-000-1"
-                ],
-                "breed_for": [
-                    "0433-04-000-1"
-                ],
-                "Any": 1
-            },
             "0361-03-000": {
                 "representative": "0361-03-000-1",
                 "catch_count": 3,
@@ -3659,14 +3649,13 @@
             },
             "0412-04-001": {
                 "representative": "0412-04-001-0",
-                "catch_count": 3,
+                "catch_count": 2,
                 "evolve_to": [
                     "0412-04-001-0",
-                    "0413-04-001-2",
-                    "0414-04-000-1"
+                    "0413-04-001-2"
                 ],
                 "breed_for": [],
-                "Any": 3
+                "Any": 2
             },
             "0412-04-002": {
                 "representative": "0412-04-002-0",
@@ -3680,13 +3669,14 @@
             },
             "0412-04-003": {
                 "representative": "0412-04-003-0",
-                "catch_count": 2,
+                "catch_count": 3,
                 "evolve_to": [
                     "0412-04-003-0",
-                    "0413-04-003-2"
+                    "0413-04-003-2",
+                    "0414-04-000-1"
                 ],
                 "breed_for": [],
-                "Any": 2
+                "Any": 3
             },
             "0420-04-000": {
                 "representative": "0420-04-000-1",
@@ -3718,6 +3708,25 @@
                 "breed_for": [],
                 "Any": 2
             },
+            "0433-04-000": {
+                "representative": "0433-04-000-1",
+                "catch_count": 2,
+                "evolve_to": [
+                    "0358-03-000-1",
+                    "0433-04-000-1"
+                ],
+                "breed_for": [],
+                "Any": 2
+            },
+            "0439-04-000": {
+                "representative": "0439-04-000-1",
+                "catch_count": 1,
+                "evolve_to": [
+                    "0439-04-000-1"
+                ],
+                "breed_for": [],
+                "Any": 1
+            },
             "0442-04-000": {
                 "representative": "0442-04-000-1",
                 "catch_count": 1,
@@ -4463,15 +4472,6 @@
                 "breed_for": [],
                 "Any": 2
             },
-            "0025-01-000": {
-                "representative": "0025-01-000-1",
-                "catch_count": 1,
-                "evolve_to": [
-                    "0026-07-001-1"
-                ],
-                "breed_for": [],
-                "Any": 1
-            },
             "0037-07-001": {
                 "representative": "0037-07-001-1",
                 "catch_count": 2,
@@ -4541,6 +4541,15 @@
                 "breed_for": [],
                 "Any": 1
             },
+            "0172-02-000": {
+                "representative": "0172-02-000-1",
+                "catch_count": 1,
+                "evolve_to": [
+                    "0026-07-001-1"
+                ],
+                "breed_for": [],
+                "Any": 1
+            },
             "0722-07-000": {
                 "representative": "0722-07-000-1",
                 "catch_count": 4,
@@ -4635,6 +4644,15 @@
                 "breed_for": [],
                 "Any": 1
             },
+            "0741-07-003": {
+                "representative": "0741-07-003-1",
+                "catch_count": 1,
+                "evolve_to": [
+                    "0741-07-003-1"
+                ],
+                "breed_for": [],
+                "Any": 1
+            },
             "0741-07-004": {
                 "representative": "0741-07-004-1",
                 "catch_count": 1,
@@ -5185,26 +5203,6 @@
                 "breed_for": [],
                 "Any": 1
             },
-            "0122-01-000": {
-                "representative": "0122-01-000-1",
-                "catch_count": 2,
-                "evolve_to": [
-                    "0122-08-001-1",
-                    "0866-08-000-1"
-                ],
-                "breed_for": [],
-                "Any": 2
-            },
-            "0122-08-001": {
-                "representative": "0122-08-001-1",
-                "catch_count": 2,
-                "evolve_to": [
-                    "0122-08-001-1",
-                    "0866-08-000-1"
-                ],
-                "breed_for": [],
-                "Any": 2
-            },
             "0123-01-000": {
                 "representative": "0123-01-000-1",
                 "catch_count": 1,
@@ -5252,6 +5250,16 @@
                 "breed_for": [],
                 "Any": 3
             },
+            "0439-04-000": {
+                "representative": "0439-04-000-1",
+                "catch_count": 2,
+                "evolve_to": [
+                    "0122-08-001-1",
+                    "0866-08-000-1"
+                ],
+                "breed_for": [],
+                "Any": 2
+            },
             "0548-05-000": {
                 "representative": "0548-05-000-2",
                 "catch_count": 1,
@@ -6068,15 +6076,6 @@
                 "breed_for": [],
                 "Any": 1
             },
-            "0901-08-001": {
-                "representative": "0901-08-001-1",
-                "catch_count": 1,
-                "evolve_to": [
-                    "0901-08-001-1"
-                ],
-                "breed_for": [],
-                "Any": 1
-            },
             "0906-09-000": {
                 "representative": "0906-09-000-1",
                 "catch_count": 3,
diff --git a/pokemon_forms.db b/pokemon_forms.db
index 059560a..ad259f2 100644
Binary files a/pokemon_forms.db and b/pokemon_forms.db differ