diff --git a/anime-list-full.xml b/anime-list-full.xml
index 02f5ffa2..d3c635a0 100644
--- a/anime-list-full.xml
+++ b/anime-list-full.xml
@@ -427,6 +427,8 @@
     <name>Fushigi Yuugi</name>
     <mapping-list>
       <mapping anidbseason="0" tvdbseason="0">;1-0;2-0;3-0;4-0;5-0;6-0;7-0;8-0;9-0;10-0;11-0;12-0;13-0;</mapping>
+      <mapping anidbseason="1" tvdbseason="1" start="1" end="26"/>
+      <mapping anidbseason="1" tvdbseason="2" start="27" end="52" offset="-26"/>
     </mapping-list>
   </anime>
   <anime anidbid="88" tvdbid="80790" defaulttvdbseason="1">
@@ -1082,6 +1084,13 @@
   </anime>
   <anime anidbid="239" tvdbid="78857" defaulttvdbseason="a">
     <name>Naruto</name>
+    <mapping-list>
+      <mapping anidbseason="1" tvdbseason="1" start="1" end="35"/>
+      <mapping anidbseason="1" tvdbseason="2" start="36" end="83" offset="-35"/>
+      <mapping anidbseason="1" tvdbseason="3" start="84" end="131" offset="-83"/>
+      <mapping anidbseason="1" tvdbseason="4" start="132" end="179" offset="-131"/>
+      <mapping anidbseason="1" tvdbseason="5" start="180" end="220" offset="-179"/>
+    </mapping-list>
   </anime>
   <anime anidbid="240" tvdbid="72726" defaulttvdbseason="1">
     <name>Gasaraki</name>
@@ -13422,11 +13431,8 @@
   <anime anidbid="4635" tvdbid="281405" defaulttvdbseason="a">
     <name>Doraemon (2005)</name>
   </anime>
-  <anime anidbid="4636" tvdbid="72454" defaulttvdbseason="0">
+  <anime anidbid="4636" tvdbid="393182" defaulttvdbseason="1">
     <name>Aoyama Goushou Tanpenshuu</name>
-    <mapping-list>
-      <mapping anidbseason="1" tvdbseason="0">;1-44;2-45;3-46;</mapping>
-    </mapping-list>
   </anime>
   <anime anidbid="4637" tvdbid="80814" defaulttvdbseason="1">
     <name>009-1</name>
@@ -19486,11 +19492,10 @@
   <anime anidbid="7190" tvdbid="web" defaulttvdbseason="1" imdbid="tt3970004">
     <name>Fumiko no Kokuhaku</name>
   </anime>
-  <anime anidbid="7191" tvdbid="72454" defaulttvdbseason="0">
+  <anime anidbid="7191" tvdbid="393182" defaulttvdbseason="1" episodeoffset="3">
     <name>Aoyama Goushou Tanpenshuu 2</name>
     <mapping-list>
-      <mapping anidbseason="0" tvdbseason="0">;1-50;</mapping>
-      <mapping anidbseason="1" tvdbseason="0">;1-47;2-48;3-49;</mapping>
+      <mapping anidbseason="0" tvdbseason="1">;1-7;</mapping>
     </mapping-list>
   </anime>
   <anime anidbid="7192" tvdbid="unknown" defaulttvdbseason="1">
@@ -36947,6 +36952,9 @@
   <anime anidbid="17742" tvdbid="427819" defaulttvdbseason="1">
     <name>Hirogaru Sky! Precure</name>
   </anime>
+  <anime anidbid="17743" tvdbid="427818" defaulttvdbseason="1">
+    <name>Phoenix: Eden17</name>
+  </anime>
   <anime anidbid="17745" tvdbid="427831" defaulttvdbseason="1">
     <name>Acro Trip</name>
   </anime>
@@ -37112,6 +37120,9 @@
   <anime anidbid="18062" tvdbid="385077" defaulttvdbseason="0" episodeoffset="15">
     <name>Tonikaku Kawaii: Joshikou Hen</name>
   </anime>
+  <anime anidbid="18113" tvdbid="427818" defaulttvdbseason="0" tmdbid="1151861">
+    <name>Hi no Tori: Eden no Hana</name>
+  </anime>
   <anime anidbid="18152" tvdbid="438096" defaulttvdbseason="1">
     <name>Houkago no Breath</name>
   </anime>
diff --git a/anime-list-master.xml b/anime-list-master.xml
index 9b3e8784..f1eb7884 100644
--- a/anime-list-master.xml
+++ b/anime-list-master.xml
@@ -427,8 +427,8 @@
     <name>Fushigi Yuugi</name>
     <mapping-list>
       <mapping anidbseason="0" tvdbseason="0">;1-0;2-0;3-0;4-0;5-0;6-0;7-0;8-0;9-0;10-0;11-0;12-0;13-0;</mapping>
-      <mapping anidbseason="1" tvdbseason="1" start="1" end="26" />
-      <mapping anidbseason="1" tvdbseason="2" start="27" end="52" offset="-26" />
+      <mapping anidbseason="1" tvdbseason="1" start="1" end="26"/>
+      <mapping anidbseason="1" tvdbseason="2" start="27" end="52" offset="-26"/>
     </mapping-list>
   </anime>
   <anime anidbid="88" tvdbid="80790" defaulttvdbseason="1" episodeoffset="" tmdbid="" imdbid="">
@@ -1085,11 +1085,11 @@
   <anime anidbid="239" tvdbid="78857" defaulttvdbseason="a" episodeoffset="" tmdbid="" imdbid="">
     <name>Naruto</name>
     <mapping-list>
-      <mapping anidbseason="1" tvdbseason="1" start="1" end="35" />
-      <mapping anidbseason="1" tvdbseason="2" start="36" end="83" offset="-35" />
-      <mapping anidbseason="1" tvdbseason="3" start="84" end="131" offset="-83" />
-      <mapping anidbseason="1" tvdbseason="4" start="132" end="179" offset="-131" />
-      <mapping anidbseason="1" tvdbseason="5" start="180" end="220" offset="-179" />
+      <mapping anidbseason="1" tvdbseason="1" start="1" end="35"/>
+      <mapping anidbseason="1" tvdbseason="2" start="36" end="83" offset="-35"/>
+      <mapping anidbseason="1" tvdbseason="3" start="84" end="131" offset="-83"/>
+      <mapping anidbseason="1" tvdbseason="4" start="132" end="179" offset="-131"/>
+      <mapping anidbseason="1" tvdbseason="5" start="180" end="220" offset="-179"/>
     </mapping-list>
   </anime>
   <anime anidbid="240" tvdbid="72726" defaulttvdbseason="1" episodeoffset="" tmdbid="" imdbid="">
diff --git a/anime-list-todo.xml b/anime-list-todo.xml
index 8fa3a6c5..9e5061be 100644
--- a/anime-list-todo.xml
+++ b/anime-list-todo.xml
@@ -11971,9 +11971,6 @@
   <anime anidbid="17740" tvdbid="" defaulttvdbseason="" episodeoffset="" tmdbid="" imdbid="">
     <name>Guardy Girls</name>
   </anime>
-  <anime anidbid="17743" tvdbid="" defaulttvdbseason="" episodeoffset="" tmdbid="" imdbid="">
-    <name>Phoenix: Eden17</name>
-  </anime>
   <anime anidbid="17744" tvdbid="" defaulttvdbseason="" episodeoffset="" tmdbid="" imdbid="">
     <name>Project Bullet/Bullet</name>
   </anime>
@@ -12859,9 +12856,6 @@
   <anime anidbid="18112" tvdbid="" defaulttvdbseason="" episodeoffset="" tmdbid="" imdbid="">
     <name>Tsuma Netori Kan: Bijutsu Kyoushi no Baai</name>
   </anime>
-  <anime anidbid="18113" tvdbid="" defaulttvdbseason="" episodeoffset="" tmdbid="" imdbid="">
-    <name>Hi no Tori: Eden no Hana</name>
-  </anime>
   <anime anidbid="18114" tvdbid="" defaulttvdbseason="" episodeoffset="" tmdbid="" imdbid="">
     <name>30-sai made Doutei da to Mahou Tsukai ni Nareru Rashii</name>
   </anime>
@@ -13070,4 +13064,4 @@
     <name>Sweet and Hot</name>
   </anime>
 </anime-list>
-<!--4350 titles remaining-->
+<!--4348 titles remaining-->
diff --git a/anime-list.xml b/anime-list.xml
index 66452b71..91b8246c 100644
--- a/anime-list.xml
+++ b/anime-list.xml
@@ -427,6 +427,8 @@
     <name>Fushigi Yuugi</name>
     <mapping-list>
       <mapping anidbseason="0" tvdbseason="0">;1-0;2-0;3-0;4-0;5-0;6-0;7-0;8-0;9-0;10-0;11-0;12-0;13-0;</mapping>
+      <mapping anidbseason="1" tvdbseason="1" start="1" end="26"/>
+      <mapping anidbseason="1" tvdbseason="2" start="27" end="52" offset="-26"/>
     </mapping-list>
   </anime>
   <anime anidbid="88" tvdbid="80790" defaulttvdbseason="1">
@@ -1082,6 +1084,13 @@
   </anime>
   <anime anidbid="239" tvdbid="78857" defaulttvdbseason="a">
     <name>Naruto</name>
+    <mapping-list>
+      <mapping anidbseason="1" tvdbseason="1" start="1" end="35"/>
+      <mapping anidbseason="1" tvdbseason="2" start="36" end="83" offset="-35"/>
+      <mapping anidbseason="1" tvdbseason="3" start="84" end="131" offset="-83"/>
+      <mapping anidbseason="1" tvdbseason="4" start="132" end="179" offset="-131"/>
+      <mapping anidbseason="1" tvdbseason="5" start="180" end="220" offset="-179"/>
+    </mapping-list>
   </anime>
   <anime anidbid="240" tvdbid="72726" defaulttvdbseason="1">
     <name>Gasaraki</name>
@@ -11880,11 +11889,8 @@
   <anime anidbid="4635" tvdbid="281405" defaulttvdbseason="a">
     <name>Doraemon (2005)</name>
   </anime>
-  <anime anidbid="4636" tvdbid="72454" defaulttvdbseason="0">
+  <anime anidbid="4636" tvdbid="393182" defaulttvdbseason="1">
     <name>Aoyama Goushou Tanpenshuu</name>
-    <mapping-list>
-      <mapping anidbseason="1" tvdbseason="0">;1-44;2-45;3-46;</mapping>
-    </mapping-list>
   </anime>
   <anime anidbid="4637" tvdbid="80814" defaulttvdbseason="1">
     <name>009-1</name>
@@ -17017,11 +17023,10 @@
   <anime anidbid="7190" tvdbid="web" defaulttvdbseason="1" imdbid="tt3970004">
     <name>Fumiko no Kokuhaku</name>
   </anime>
-  <anime anidbid="7191" tvdbid="72454" defaulttvdbseason="0">
+  <anime anidbid="7191" tvdbid="393182" defaulttvdbseason="1" episodeoffset="3">
     <name>Aoyama Goushou Tanpenshuu 2</name>
     <mapping-list>
-      <mapping anidbseason="0" tvdbseason="0">;1-50;</mapping>
-      <mapping anidbseason="1" tvdbseason="0">;1-47;2-48;3-49;</mapping>
+      <mapping anidbseason="0" tvdbseason="1">;1-7;</mapping>
     </mapping-list>
   </anime>
   <anime anidbid="7193" tvdbid="movie" defaulttvdbseason="1" tmdbid="380412" imdbid="tt1092363">
@@ -33659,6 +33664,9 @@
   <anime anidbid="17742" tvdbid="427819" defaulttvdbseason="1">
     <name>Hirogaru Sky! Precure</name>
   </anime>
+  <anime anidbid="17743" tvdbid="427818" defaulttvdbseason="1">
+    <name>Phoenix: Eden17</name>
+  </anime>
   <anime anidbid="17745" tvdbid="427831" defaulttvdbseason="1">
     <name>Acro Trip</name>
   </anime>
@@ -33824,6 +33832,9 @@
   <anime anidbid="18062" tvdbid="385077" defaulttvdbseason="0" episodeoffset="15">
     <name>Tonikaku Kawaii: Joshikou Hen</name>
   </anime>
+  <anime anidbid="18113" tvdbid="427818" defaulttvdbseason="0" tmdbid="1151861">
+    <name>Hi no Tori: Eden no Hana</name>
+  </anime>
   <anime anidbid="18152" tvdbid="438096" defaulttvdbseason="1">
     <name>Houkago no Breath</name>
   </anime>