diff --git a/AtlasLootClassic_Data/source-tbc.lua b/AtlasLootClassic_Data/source-tbc.lua
index 95e17a94..1c004411 100644
--- a/AtlasLootClassic_Data/source-tbc.lua
+++ b/AtlasLootClassic_Data/source-tbc.lua
@@ -36,6 +36,7 @@ local SOURCE_DATA = {
 		"MagistersTerrace",
 		"Karazhan",
 		"ZulAman",
+		"WorldBossesBC",
 		"MagtheridonsLair",
 		"GruulsLair",
 		"SerpentshrineCavern",
@@ -2372,41 +2373,41 @@ local SOURCE_DATA = {
 		[28771] = {17,15,1},
 		[28772] = {17,15,1},
 		[28773] = {17,15,1},
-		[28774] = {19,1,1},
-		[28775] = {19,1,1},
-		[28776] = {19,1,1},
-		[28777] = {19,1,1},
-		[28778] = {19,1,1},
-		[28779] = {19,1,1},
-		[28780] = {19,1,1},
-		[28781] = {19,1,1},
-		[28782] = {19,1,1},
-		[28783] = {19,1,1},
+		[28774] = {20,1,1},
+		[28775] = {20,1,1},
+		[28776] = {20,1,1},
+		[28777] = {20,1,1},
+		[28778] = {20,1,1},
+		[28779] = {20,1,1},
+		[28780] = {20,1,1},
+		[28781] = {20,1,1},
+		[28782] = {20,1,1},
+		[28783] = {20,1,1},
 		[28785] = {17,11,1},
-		[28789] = {19,1,1},
+		[28789] = {20,1,1},
 		[28790] = 32385,
 		[28791] = 32385,
 		[28792] = 32385,
 		[28793] = 32385,
-		[28794] = {20,2,1},
-		[28795] = {20,1,1},
-		[28796] = {20,1,1},
-		[28797] = {20,1,1},
-		[28799] = {20,1,1},
-		[28800] = {20,1,1},
-		[28801] = {20,1,1},
-		[28802] = {20,2,1},
-		[28803] = {20,2,1},
-		[28804] = {20,2,1},
-		[28810] = {20,2,1},
-		[28822] = {20,2,1},
-		[28823] = {20,2,1},
-		[28824] = {20,2,1},
-		[28825] = {20,2,1},
-		[28826] = {20,2,1},
-		[28827] = {20,2,1},
-		[28828] = {20,2,1},
-		[28830] = {20,2,1},
+		[28794] = {21,2,1},
+		[28795] = {21,1,1},
+		[28796] = {21,1,1},
+		[28797] = {21,1,1},
+		[28799] = {21,1,1},
+		[28800] = {21,1,1},
+		[28801] = {21,1,1},
+		[28802] = {21,2,1},
+		[28803] = {21,2,1},
+		[28804] = {21,2,1},
+		[28810] = {21,2,1},
+		[28822] = {21,2,1},
+		[28823] = {21,2,1},
+		[28824] = {21,2,1},
+		[28825] = {21,2,1},
+		[28826] = {21,2,1},
+		[28827] = {21,2,1},
+		[28828] = {21,2,1},
+		[28830] = {21,2,1},
 		[28963] = 29759,
 		[28964] = 29755,
 		[28966] = 29765,
@@ -2541,7 +2542,7 @@ local SOURCE_DATA = {
 		[29359] = {[1] = 14,[2] = 5,[3] = 1,[5] = 1},
 		[29360] = {[1] = 13,[2] = 4,[3] = 1,[5] = 1},
 		[29362] = {[1] = 15,[2] = 3,[3] = 1,[5] = 1},
-		[29458] = {19,1,1},
+		[29458] = {20,1,1},
 		[29463] = {[1] = 10,[2] = 3,[3] = 1,[5] = 1},
 		[29483] = {[3] = 6,[4] = 35520},
 		[29485] = {[3] = 6,[4] = 35521},
@@ -2599,77 +2600,77 @@ local SOURCE_DATA = {
 		[29673] = {10,1,1},
 		[29674] = {8,1,1},
 		[29675] = {12,1,1},
-		[29753] = {19,1,1},
-		[29754] = {19,1,1},
-		[29755] = {19,1,1},
+		[29753] = {20,1,1},
+		[29754] = {20,1,1},
+		[29755] = {20,1,1},
 		[29756] = {17,10,1},
 		[29757] = {17,10,1},
 		[29758] = {17,10,1},
 		[29759] = {17,15,1},
 		[29760] = {17,15,1},
 		[29761] = {17,15,1},
-		[29762] = {20,1,1},
-		[29763] = {20,1,1},
-		[29764] = {20,1,1},
-		[29765] = {20,2,1},
-		[29766] = {20,2,1},
-		[29767] = {20,2,1},
-		[29905] = {22,4,1},
-		[29906] = {21,6,1},
-		[29918] = {22,1,1},
-		[29920] = {22,1,1},
-		[29921] = {22,1,1},
-		[29922] = {22,1,1},
-		[29923] = {22,1,1},
-		[29924] = {22,1,1},
-		[29925] = {22,1,1},
-		[29947] = {22,1,1},
-		[29948] = {22,1,1},
-		[29949] = {22,1,1},
-		[29950] = {22,3,1},
-		[29951] = {22,3,1},
-		[29962] = {22,3,1},
+		[29762] = {21,1,1},
+		[29763] = {21,1,1},
+		[29764] = {21,1,1},
+		[29765] = {21,2,1},
+		[29766] = {21,2,1},
+		[29767] = {21,2,1},
+		[29905] = {23,4,1},
+		[29906] = {22,6,1},
+		[29918] = {23,1,1},
+		[29920] = {23,1,1},
+		[29921] = {23,1,1},
+		[29922] = {23,1,1},
+		[29923] = {23,1,1},
+		[29924] = {23,1,1},
+		[29925] = {23,1,1},
+		[29947] = {23,1,1},
+		[29948] = {23,1,1},
+		[29949] = {23,1,1},
+		[29950] = {23,3,1},
+		[29951] = {23,3,1},
+		[29962] = {23,3,1},
 		[29964] = {[3] = 6,[4] = 36074},
-		[29965] = {22,3,1},
-		[29966] = {22,3,1},
+		[29965] = {23,3,1},
+		[29966] = {23,3,1},
 		[29970] = {[3] = 6,[4] = 36075},
 		[29971] = {[3] = 6,[4] = 36076},
-		[29972] = {22,3,1},
+		[29972] = {23,3,1},
 		[29973] = {[3] = 6,[4] = 36077},
 		[29974] = {[3] = 6,[4] = 36078},
 		[29975] = {[3] = 6,[4] = 36079},
-		[29976] = {22,3,1},
-		[29977] = {22,3,1},
-		[29981] = {22,3,1},
-		[29982] = {22,3,1},
-		[29983] = {22,2,1},
-		[29984] = {22,2,1},
-		[29985] = {22,2,1},
-		[29986] = {22,2,1},
-		[29987] = {22,4,1},
-		[29988] = {22,4,1},
-		[29989] = {22,4,1},
-		[29990] = {22,4,1},
-		[29991] = {22,4,1},
-		[29992] = {22,4,1},
-		[29993] = {22,4,1},
-		[29994] = {22,4,1},
-		[29995] = {22,4,1},
-		[29996] = {22,4,1},
-		[29997] = {22,4,1},
-		[29998] = {22,4,1},
-		[30008] = {21,5,1},
-		[30020] = {22,6,1},
-		[30021] = {21,7,1},
-		[30022] = {21,7,1},
-		[30023] = {21,7,1},
-		[30024] = {22,6,1},
-		[30025] = {21,7,1},
-		[30026] = {22,6,1},
-		[30027] = {21,7,1},
-		[30028] = {22,6,1},
-		[30029] = {22,6,1},
-		[30030] = {22,6,1},
+		[29976] = {23,3,1},
+		[29977] = {23,3,1},
+		[29981] = {23,3,1},
+		[29982] = {23,3,1},
+		[29983] = {23,2,1},
+		[29984] = {23,2,1},
+		[29985] = {23,2,1},
+		[29986] = {23,2,1},
+		[29987] = {23,4,1},
+		[29988] = {23,4,1},
+		[29989] = {23,4,1},
+		[29990] = {23,4,1},
+		[29991] = {23,4,1},
+		[29992] = {23,4,1},
+		[29993] = {23,4,1},
+		[29994] = {23,4,1},
+		[29995] = {23,4,1},
+		[29996] = {23,4,1},
+		[29997] = {23,4,1},
+		[29998] = {23,4,1},
+		[30008] = {22,5,1},
+		[30020] = {23,6,1},
+		[30021] = {22,7,1},
+		[30022] = {22,7,1},
+		[30023] = {22,7,1},
+		[30024] = {23,6,1},
+		[30025] = {22,7,1},
+		[30026] = {23,6,1},
+		[30027] = {22,7,1},
+		[30028] = {23,6,1},
+		[30029] = {23,6,1},
+		[30030] = {23,6,1},
 		[30031] = {[3] = 5,[4] = 36392},
 		[30032] = {[3] = 5,[4] = 36390},
 		[30033] = {[3] = 5,[4] = 36391},
@@ -2686,70 +2687,70 @@ local SOURCE_DATA = {
 		[30044] = {[3] = 6,[4] = 36353},
 		[30045] = {[3] = 6,[4] = 36358},
 		[30046] = {[3] = 6,[4] = 36352},
-		[30047] = {21,1,1},
-		[30048] = {21,1,1},
-		[30049] = {21,1,1},
-		[30050] = {21,1,1},
-		[30051] = {21,1,1},
-		[30052] = {21,1,1},
-		[30053] = {21,1,1},
-		[30054] = {21,1,1},
-		[30055] = {21,1,1},
-		[30056] = {21,1,1},
-		[30057] = {21,2,1},
-		[30058] = {21,2,1},
-		[30059] = {21,2,1},
-		[30060] = {21,2,1},
-		[30061] = {21,2,1},
-		[30062] = {21,2,1},
-		[30063] = {21,2,1},
-		[30064] = {21,2,1},
-		[30065] = {21,2,1},
-		[30066] = {21,2,1},
-		[30067] = {21,2,1},
-		[30068] = {21,5,1},
+		[30047] = {22,1,1},
+		[30048] = {22,1,1},
+		[30049] = {22,1,1},
+		[30050] = {22,1,1},
+		[30051] = {22,1,1},
+		[30052] = {22,1,1},
+		[30053] = {22,1,1},
+		[30054] = {22,1,1},
+		[30055] = {22,1,1},
+		[30056] = {22,1,1},
+		[30057] = {22,2,1},
+		[30058] = {22,2,1},
+		[30059] = {22,2,1},
+		[30060] = {22,2,1},
+		[30061] = {22,2,1},
+		[30062] = {22,2,1},
+		[30063] = {22,2,1},
+		[30064] = {22,2,1},
+		[30065] = {22,2,1},
+		[30066] = {22,2,1},
+		[30067] = {22,2,1},
+		[30068] = {22,5,1},
 		[30069] = {[3] = 5,[4] = 36122},
 		[30070] = {[3] = 5,[4] = 36124},
 		[30071] = {[3] = 5,[4] = 36125},
 		[30072] = {[3] = 5,[4] = 36126},
 		[30073] = {[3] = 5,[4] = 36128},
 		[30074] = {[3] = 5,[4] = 36129},
-		[30075] = {21,5,1},
+		[30075] = {22,5,1},
 		[30076] = {[3] = 5,[4] = 36130},
 		[30077] = {[3] = 5,[4] = 36131},
-		[30079] = {21,5,1},
-		[30080] = {21,5,1},
-		[30081] = {21,5,1},
-		[30082] = {21,5,1},
-		[30083] = {21,5,1},
-		[30084] = {21,5,1},
-		[30085] = {21,5,1},
+		[30079] = {22,5,1},
+		[30080] = {22,5,1},
+		[30081] = {22,5,1},
+		[30082] = {22,5,1},
+		[30083] = {22,5,1},
+		[30084] = {22,5,1},
+		[30085] = {22,5,1},
 		[30086] = {[3] = 5,[4] = 36133},
 		[30087] = {[3] = 5,[4] = 36134},
 		[30088] = {[3] = 5,[4] = 36135},
 		[30089] = {[3] = 5,[4] = 36136},
-		[30090] = {21,4,1},
-		[30091] = {21,3,1},
-		[30092] = {21,3,1},
+		[30090] = {22,4,1},
+		[30091] = {22,3,1},
+		[30092] = {22,3,1},
 		[30093] = {[3] = 5,[4] = 36137},
-		[30095] = {21,3,1},
-		[30096] = {21,3,1},
-		[30097] = {21,3,1},
-		[30098] = {21,5,1},
-		[30099] = {21,4,1},
-		[30100] = {21,4,1},
-		[30101] = {21,4,1},
-		[30102] = {21,6,1},
-		[30103] = {21,6,1},
-		[30104] = {21,6,1},
-		[30105] = {21,6,1},
-		[30106] = {21,6,1},
-		[30107] = {21,6,1},
-		[30108] = {21,6,1},
-		[30109] = {21,6,1},
-		[30110] = {21,6,1},
-		[30111] = {21,6,1},
-		[30112] = {21,6,1},
+		[30095] = {22,3,1},
+		[30096] = {22,3,1},
+		[30097] = {22,3,1},
+		[30098] = {22,5,1},
+		[30099] = {22,4,1},
+		[30100] = {22,4,1},
+		[30101] = {22,4,1},
+		[30102] = {22,6,1},
+		[30103] = {22,6,1},
+		[30104] = {22,6,1},
+		[30105] = {22,6,1},
+		[30106] = {22,6,1},
+		[30107] = {22,6,1},
+		[30108] = {22,6,1},
+		[30109] = {22,6,1},
+		[30110] = {22,6,1},
+		[30111] = {22,6,1},
+		[30112] = {22,6,1},
 		[30113] = 30237,
 		[30114] = 30240,
 		[30115] = 30243,
@@ -2806,7 +2807,7 @@ local SOURCE_DATA = {
 		[30171] = 30242,
 		[30172] = 30245,
 		[30173] = 30248,
-		[30183] = {{21,7,1},{22,6,1}},
+		[30183] = {{22,7,1},{23,6,1}},
 		[30185] = 30236,
 		[30189] = 30239,
 		[30190] = 30242,
@@ -2836,56 +2837,56 @@ local SOURCE_DATA = {
 		[30233] = 30243,
 		[30234] = 30246,
 		[30235] = 30249,
-		[30236] = {22,4,1},
-		[30237] = {22,4,1},
-		[30238] = {22,4,1},
-		[30239] = {21,3,1},
-		[30240] = {21,3,1},
-		[30241] = {21,3,1},
-		[30242] = {21,6,1},
-		[30243] = {21,6,1},
-		[30244] = {21,6,1},
-		[30245] = {21,4,1},
-		[30246] = {21,4,1},
-		[30247] = {21,4,1},
-		[30248] = {22,2,1},
-		[30249] = {22,2,1},
-		[30250] = {22,2,1},
-		[30280] = {{21,7,1},{22,6,1}},
-		[30281] = {{21,7,1},{22,6,1}},
-		[30282] = {{21,7,1},{22,6,1}},
-		[30283] = {{21,7,1},{22,6,1}},
-		[30301] = {{21,7,1},{22,6,1}},
-		[30302] = {{21,7,1},{22,6,1}},
-		[30303] = {{21,7,1},{22,6,1}},
-		[30304] = {{21,7,1},{22,6,1}},
-		[30305] = {{21,7,1},{22,6,1}},
-		[30306] = {{21,7,1},{22,6,1}},
-		[30307] = {{21,7,1},{22,6,1}},
-		[30308] = {{21,7,1},{22,6,1}},
-		[30311] = {22,5,1},
-		[30312] = {22,5,1},
-		[30313] = {22,5,1},
-		[30314] = {22,5,1},
-		[30316] = {22,5,1},
-		[30317] = {22,5,1},
-		[30318] = {22,5,1},
-		[30319] = {22,5,1},
-		[30321] = {{21,7,1},{22,6,1}},
-		[30322] = {{21,7,1},{22,6,1}},
-		[30323] = {{21,7,1},{22,6,1}},
-		[30324] = {{21,7,1},{22,6,1}},
+		[30236] = {23,4,1},
+		[30237] = {23,4,1},
+		[30238] = {23,4,1},
+		[30239] = {22,3,1},
+		[30240] = {22,3,1},
+		[30241] = {22,3,1},
+		[30242] = {22,6,1},
+		[30243] = {22,6,1},
+		[30244] = {22,6,1},
+		[30245] = {22,4,1},
+		[30246] = {22,4,1},
+		[30247] = {22,4,1},
+		[30248] = {23,2,1},
+		[30249] = {23,2,1},
+		[30250] = {23,2,1},
+		[30280] = {{22,7,1},{23,6,1}},
+		[30281] = {{22,7,1},{23,6,1}},
+		[30282] = {{22,7,1},{23,6,1}},
+		[30283] = {{22,7,1},{23,6,1}},
+		[30301] = {{22,7,1},{23,6,1}},
+		[30302] = {{22,7,1},{23,6,1}},
+		[30303] = {{22,7,1},{23,6,1}},
+		[30304] = {{22,7,1},{23,6,1}},
+		[30305] = {{22,7,1},{23,6,1}},
+		[30306] = {{22,7,1},{23,6,1}},
+		[30307] = {{22,7,1},{23,6,1}},
+		[30308] = {{22,7,1},{23,6,1}},
+		[30311] = {23,5,1},
+		[30312] = {23,5,1},
+		[30313] = {23,5,1},
+		[30314] = {23,5,1},
+		[30316] = {23,5,1},
+		[30317] = {23,5,1},
+		[30318] = {23,5,1},
+		[30319] = {23,5,1},
+		[30321] = {{22,7,1},{23,6,1}},
+		[30322] = {{22,7,1},{23,6,1}},
+		[30323] = {{22,7,1},{23,6,1}},
+		[30324] = {{22,7,1},{23,6,1}},
 		[30419] = {[3] = 17,[4] = 36523},
 		[30420] = {[3] = 17,[4] = 36524},
 		[30421] = {[3] = 17,[4] = 36525},
 		[30422] = {[3] = 17,[4] = 36526},
 		[30436] = {15,5,1},
 		[30437] = {15,6,1},
-		[30446] = {22,3,1},
-		[30447] = {22,1,1},
-		[30448] = {22,1,1},
-		[30449] = {22,3,1},
-		[30450] = {22,2,1},
+		[30446] = {23,3,1},
+		[30447] = {23,1,1},
+		[30448] = {23,1,1},
+		[30449] = {23,3,1},
+		[30450] = {23,2,1},
 		[30459] = {[3] = 11,[4] = 36665},
 		[30460] = {[3] = 11,[4] = 36667},
 		[30461] = {[3] = 11,[4] = 36668},
@@ -2949,19 +2950,19 @@ local SOURCE_DATA = {
 		[30606] = {{[1] = 9,[2] = 1,[3] = 1,[5] = 1},{[1] = 9,[2] = 2,[3] = 1,[5] = 1},{[1] = 9,[2] = 3,[3] = 1,[5] = 1},{[1] = 9,[2] = 4,[3] = 1,[5] = 1}},
 		[30607] = {{[1] = 9,[2] = 1,[3] = 1,[5] = 1},{[1] = 9,[2] = 2,[3] = 1,[5] = 1},{[1] = 9,[2] = 3,[3] = 1,[5] = 1},{[1] = 9,[2] = 4,[3] = 1,[5] = 1}},
 		[30608] = {{[1] = 9,[2] = 1,[3] = 1,[5] = 1},{[1] = 9,[2] = 2,[3] = 1,[5] = 1},{[1] = 9,[2] = 3,[3] = 1,[5] = 1},{[1] = 9,[2] = 4,[3] = 1,[5] = 1}},
-		[30619] = {22,2,1},
-		[30620] = {21,7,1},
-		[30621] = {21,6,1},
-		[30626] = {21,4,1},
-		[30627] = {21,3,1},
-		[30629] = {21,1,1},
+		[30619] = {23,2,1},
+		[30620] = {22,7,1},
+		[30621] = {22,6,1},
+		[30626] = {22,4,1},
+		[30627] = {22,3,1},
+		[30629] = {22,1,1},
 		[30641] = {17,17,1},
 		[30642] = {17,17,1},
 		[30643] = {17,17,1},
 		[30644] = {17,17,1},
-		[30663] = {21,4,1},
-		[30664] = {21,1,1},
-		[30665] = {21,2,1},
+		[30663] = {22,4,1},
+		[30664] = {22,1,1},
+		[30665] = {22,2,1},
 		[30666] = {17,17,1},
 		[30667] = {17,17,1},
 		[30668] = {17,17,1},
@@ -2984,7 +2985,27 @@ local SOURCE_DATA = {
 		[30708] = {[1] = 3,[2] = 2,[3] = 1,[5] = 1},
 		[30709] = {[1] = 3,[2] = 2,[3] = 1,[5] = 1},
 		[30710] = {[1] = 3,[2] = 2,[3] = 1,[5] = 1},
-		[30720] = {21,5,1},
+		[30720] = {22,5,1},
+		[30722] = {19,1,1},
+		[30723] = {19,1,1},
+		[30724] = {19,1,1},
+		[30725] = {19,1,1},
+		[30726] = {19,1,1},
+		[30727] = {19,1,1},
+		[30728] = {19,1,1},
+		[30729] = {19,1,1},
+		[30730] = {19,1,1},
+		[30731] = {19,1,1},
+		[30732] = {19,2,1},
+		[30733] = {19,2,1},
+		[30734] = {19,2,1},
+		[30735] = {19,2,1},
+		[30736] = {19,2,1},
+		[30737] = {19,2,1},
+		[30738] = {19,2,1},
+		[30739] = {19,2,1},
+		[30740] = {19,2,1},
+		[30741] = {19,2,1},
 		[30804] = {[3] = 17,[4] = 37818},
 		[30808] = {7,2,1},
 		[30816] = {[3] = 9,[4] = 37836},
@@ -2997,60 +3018,60 @@ local SOURCE_DATA = {
 		[30837] = {[3] = 11,[4] = 37882},
 		[30838] = {[3] = 11,[4] = 37883},
 		[30839] = {[3] = 11,[4] = 37884},
-		[30861] = {23,1,1},
-		[30862] = {23,1,1},
-		[30863] = {23,1,1},
-		[30864] = {23,1,1},
-		[30865] = {23,1,1},
-		[30866] = {23,1,1},
-		[30868] = {23,1,1},
-		[30869] = {23,1,1},
-		[30870] = {23,1,1},
-		[30871] = {23,1,1},
-		[30872] = {23,1,1},
-		[30873] = {23,1,1},
-		[30874] = {23,2,1},
-		[30878] = {23,2,1},
-		[30879] = {23,2,1},
-		[30880] = {23,2,1},
-		[30881] = {23,2,1},
-		[30882] = {23,2,1},
-		[30883] = {23,2,1},
-		[30884] = {23,2,1},
-		[30885] = {23,2,1},
-		[30886] = {23,2,1},
-		[30887] = {23,2,1},
-		[30888] = {23,2,1},
-		[30889] = {23,3,1},
-		[30891] = {23,3,1},
-		[30892] = {23,3,1},
-		[30893] = {23,3,1},
-		[30894] = {23,3,1},
-		[30895] = {23,3,1},
-		[30896] = {23,4,1},
-		[30897] = {23,4,1},
-		[30898] = {23,4,1},
-		[30899] = {23,4,1},
-		[30900] = {23,4,1},
-		[30901] = {23,4,1},
-		[30902] = {23,5,1},
-		[30903] = {23,5,1},
-		[30904] = {23,5,1},
-		[30905] = {23,5,1},
-		[30906] = {23,5,1},
-		[30907] = {23,5,1},
-		[30908] = {23,5,1},
-		[30909] = {23,5,1},
-		[30910] = {23,5,1},
-		[30911] = {23,5,1},
-		[30912] = {23,5,1},
-		[30913] = {23,5,1},
-		[30914] = {23,3,1},
-		[30915] = {23,3,1},
-		[30916] = {23,3,1},
-		[30917] = {23,3,1},
-		[30918] = {23,3,1},
-		[30919] = {23,3,1},
+		[30861] = {24,1,1},
+		[30862] = {24,1,1},
+		[30863] = {24,1,1},
+		[30864] = {24,1,1},
+		[30865] = {24,1,1},
+		[30866] = {24,1,1},
+		[30868] = {24,1,1},
+		[30869] = {24,1,1},
+		[30870] = {24,1,1},
+		[30871] = {24,1,1},
+		[30872] = {24,1,1},
+		[30873] = {24,1,1},
+		[30874] = {24,2,1},
+		[30878] = {24,2,1},
+		[30879] = {24,2,1},
+		[30880] = {24,2,1},
+		[30881] = {24,2,1},
+		[30882] = {24,2,1},
+		[30883] = {24,2,1},
+		[30884] = {24,2,1},
+		[30885] = {24,2,1},
+		[30886] = {24,2,1},
+		[30887] = {24,2,1},
+		[30888] = {24,2,1},
+		[30889] = {24,3,1},
+		[30891] = {24,3,1},
+		[30892] = {24,3,1},
+		[30893] = {24,3,1},
+		[30894] = {24,3,1},
+		[30895] = {24,3,1},
+		[30896] = {24,4,1},
+		[30897] = {24,4,1},
+		[30898] = {24,4,1},
+		[30899] = {24,4,1},
+		[30900] = {24,4,1},
+		[30901] = {24,4,1},
+		[30902] = {24,5,1},
+		[30903] = {24,5,1},
+		[30904] = {24,5,1},
+		[30905] = {24,5,1},
+		[30906] = {24,5,1},
+		[30907] = {24,5,1},
+		[30908] = {24,5,1},
+		[30909] = {24,5,1},
+		[30910] = {24,5,1},
+		[30911] = {24,5,1},
+		[30912] = {24,5,1},
+		[30913] = {24,5,1},
+		[30914] = {24,3,1},
+		[30915] = {24,3,1},
+		[30916] = {24,3,1},
+		[30917] = {24,3,1},
+		[30918] = {24,3,1},
+		[30919] = {24,3,1},
 		[30969] = 31094,
 		[30970] = 31094,
 		[30972] = 31095,
@@ -3140,21 +3161,21 @@ local SOURCE_DATA = {
 		[31080] = {[3] = 7,[4] = 38070},
 		[31085] = {14,5,1},
 		[31086] = {15,3,1},
-		[31089] = {24,9,1},
-		[31090] = {24,9,1},
-		[31091] = {24,9,1},
-		[31092] = {23,4,1},
-		[31093] = {23,4,1},
-		[31094] = {23,4,1},
-		[31095] = {23,5,1},
-		[31096] = {23,5,1},
-		[31097] = {23,5,1},
-		[31098] = {24,8,1},
-		[31099] = {24,8,1},
-		[31100] = {24,8,1},
-		[31101] = {24,7,1},
-		[31102] = {24,7,1},
-		[31103] = {24,7,1},
+		[31089] = {25,9,1},
+		[31090] = {25,9,1},
+		[31091] = {25,9,1},
+		[31092] = {24,4,1},
+		[31093] = {24,4,1},
+		[31094] = {24,4,1},
+		[31095] = {24,5,1},
+		[31096] = {24,5,1},
+		[31097] = {24,5,1},
+		[31098] = {25,8,1},
+		[31099] = {25,8,1},
+		[31100] = {25,8,1},
+		[31101] = {25,7,1},
+		[31102] = {25,7,1},
+		[31103] = {25,7,1},
 		[31154] = {[3] = 17,[4] = 38175},
 		[31364] = {[3] = 5,[4] = 38473},
 		[31367] = {[3] = 5,[4] = 38475},
@@ -3177,7 +3198,7 @@ local SOURCE_DATA = {
 		[31721] = {[1] = 10,[2] = 3,[3] = 1,[5] = 1},
 		[31722] = {[1] = 7,[2] = 4,[3] = 1,[5] = 1},
 		[31744] = {14,2,1},
-		[31750] = {20,2,1},
+		[31750] = {21,2,1},
 		[31751] = {17,16,1},
 		[31860] = {[3] = 17,[4] = 39451},
 		[31861] = {[3] = 17,[4] = 39452},
@@ -3242,109 +3263,109 @@ local SOURCE_DATA = {
 		[32224] = {[3] = 17,[4] = 39740},
 		[32225] = {[3] = 17,[4] = 39741},
 		[32226] = {[3] = 17,[4] = 39742},
-		[32227] = {{24,10,1},{25,8,1}},
-		[32228] = {{24,10,1},{25,8,1}},
-		[32229] = {{24,10,1},{25,8,1}},
-		[32230] = {{24,10,1},{25,8,1}},
-		[32231] = {{24,10,1},{25,8,1}},
-		[32232] = {24,1,1},
-		[32234] = {24,1,1},
-		[32235] = {24,9,1},
-		[32236] = {24,1,1},
-		[32237] = {24,1,1},
-		[32238] = {24,1,1},
-		[32239] = {24,1,1},
-		[32240] = {24,1,1},
-		[32241] = {24,1,1},
-		[32242] = {24,1,1},
-		[32243] = {24,1,1},
-		[32245] = {24,1,1},
-		[32247] = {24,1,1},
-		[32248] = {24,1,1},
-		[32249] = {{24,10,1},{25,8,1}},
-		[32250] = {24,2,1},
-		[32251] = {24,2,1},
-		[32252] = {24,2,1},
-		[32253] = {24,2,1},
-		[32254] = {24,2,1},
-		[32255] = {24,2,1},
-		[32256] = {24,2,1},
-		[32257] = {24,2,1},
-		[32258] = {24,2,1},
-		[32259] = {24,2,1},
-		[32260] = {24,2,1},
-		[32261] = {24,2,1},
-		[32262] = {24,2,1},
-		[32263] = {24,3,1},
-		[32264] = {24,3,1},
-		[32265] = {24,3,1},
-		[32266] = {24,3,1},
-		[32267] = {22,3,1},
-		[32268] = {24,3,1},
-		[32269] = {24,5,1},
-		[32270] = {24,3,1},
-		[32271] = {24,3,1},
-		[32273] = {24,3,1},
-		[32275] = {24,3,1},
-		[32276] = {24,3,1},
-		[32278] = {24,3,1},
-		[32279] = {24,3,1},
-		[32280] = {24,4,1},
-		[32285] = {23,6,1},
-		[32289] = {23,6,1},
-		[32295] = {23,6,1},
-		[32296] = {23,6,1},
-		[32297] = {23,6,1},
-		[32298] = {23,6,1},
-		[32303] = {23,6,1},
-		[32307] = {23,6,1},
-		[32323] = {24,4,1},
-		[32324] = {24,4,1},
-		[32325] = {24,4,1},
-		[32326] = {24,4,1},
-		[32327] = {24,4,1},
-		[32328] = {24,4,1},
-		[32329] = {24,4,1},
-		[32330] = {24,4,1},
-		[32331] = {24,8,1},
-		[32332] = {24,6,1},
-		[32333] = {24,5,1},
-		[32334] = {24,5,1},
-		[32335] = {24,5,1},
-		[32336] = {24,9,1},
-		[32337] = {24,5,1},
-		[32338] = {24,5,1},
-		[32339] = {24,5,1},
-		[32340] = {24,5,1},
-		[32341] = {24,5,1},
-		[32342] = {24,5,1},
-		[32343] = {24,5,1},
-		[32344] = {24,5,1},
-		[32345] = {24,6,1},
-		[32346] = {24,6,1},
-		[32347] = {24,6,1},
-		[32348] = {24,4,1},
-		[32349] = {24,6,1},
-		[32350] = {24,6,1},
-		[32351] = {24,6,1},
-		[32352] = {24,6,1},
-		[32353] = {24,6,1},
-		[32354] = {24,6,1},
-		[32361] = {24,3,1},
-		[32362] = {24,6,1},
-		[32363] = {24,6,1},
-		[32365] = {24,7,1},
-		[32366] = {24,7,1},
-		[32367] = {24,7,1},
-		[32368] = {24,7,1},
-		[32369] = {24,7,1},
-		[32370] = {24,7,1},
-		[32373] = {24,8,1},
-		[32374] = {24,9,1},
-		[32375] = {24,9,1},
-		[32376] = {24,8,1},
-		[32377] = {24,1,1},
-		[32385] = {19,1,1},
+		[32227] = {{25,10,1},{26,8,1}},
+		[32228] = {{25,10,1},{26,8,1}},
+		[32229] = {{25,10,1},{26,8,1}},
+		[32230] = {{25,10,1},{26,8,1}},
+		[32231] = {{25,10,1},{26,8,1}},
+		[32232] = {25,1,1},
+		[32234] = {25,1,1},
+		[32235] = {25,9,1},
+		[32236] = {25,1,1},
+		[32237] = {25,1,1},
+		[32238] = {25,1,1},
+		[32239] = {25,1,1},
+		[32240] = {25,1,1},
+		[32241] = {25,1,1},
+		[32242] = {25,1,1},
+		[32243] = {25,1,1},
+		[32245] = {25,1,1},
+		[32247] = {25,1,1},
+		[32248] = {25,1,1},
+		[32249] = {{25,10,1},{26,8,1}},
+		[32250] = {25,2,1},
+		[32251] = {25,2,1},
+		[32252] = {25,2,1},
+		[32253] = {25,2,1},
+		[32254] = {25,2,1},
+		[32255] = {25,2,1},
+		[32256] = {25,2,1},
+		[32257] = {25,2,1},
+		[32258] = {25,2,1},
+		[32259] = {25,2,1},
+		[32260] = {25,2,1},
+		[32261] = {25,2,1},
+		[32262] = {25,2,1},
+		[32263] = {25,3,1},
+		[32264] = {25,3,1},
+		[32265] = {25,3,1},
+		[32266] = {25,3,1},
+		[32267] = {23,3,1},
+		[32268] = {25,3,1},
+		[32269] = {25,5,1},
+		[32270] = {25,3,1},
+		[32271] = {25,3,1},
+		[32273] = {25,3,1},
+		[32275] = {25,3,1},
+		[32276] = {25,3,1},
+		[32278] = {25,3,1},
+		[32279] = {25,3,1},
+		[32280] = {25,4,1},
+		[32285] = {24,6,1},
+		[32289] = {24,6,1},
+		[32295] = {24,6,1},
+		[32296] = {24,6,1},
+		[32297] = {24,6,1},
+		[32298] = {24,6,1},
+		[32303] = {24,6,1},
+		[32307] = {24,6,1},
+		[32323] = {25,4,1},
+		[32324] = {25,4,1},
+		[32325] = {25,4,1},
+		[32326] = {25,4,1},
+		[32327] = {25,4,1},
+		[32328] = {25,4,1},
+		[32329] = {25,4,1},
+		[32330] = {25,4,1},
+		[32331] = {25,8,1},
+		[32332] = {25,6,1},
+		[32333] = {25,5,1},
+		[32334] = {25,5,1},
+		[32335] = {25,5,1},
+		[32336] = {25,9,1},
+		[32337] = {25,5,1},
+		[32338] = {25,5,1},
+		[32339] = {25,5,1},
+		[32340] = {25,5,1},
+		[32341] = {25,5,1},
+		[32342] = {25,5,1},
+		[32343] = {25,5,1},
+		[32344] = {25,5,1},
+		[32345] = {25,6,1},
+		[32346] = {25,6,1},
+		[32347] = {25,6,1},
+		[32348] = {25,4,1},
+		[32349] = {25,6,1},
+		[32350] = {25,6,1},
+		[32351] = {25,6,1},
+		[32352] = {25,6,1},
+		[32353] = {25,6,1},
+		[32354] = {25,6,1},
+		[32361] = {25,3,1},
+		[32362] = {25,6,1},
+		[32363] = {25,6,1},
+		[32365] = {25,7,1},
+		[32366] = {25,7,1},
+		[32367] = {25,7,1},
+		[32368] = {25,7,1},
+		[32369] = {25,7,1},
+		[32370] = {25,7,1},
+		[32373] = {25,8,1},
+		[32374] = {25,9,1},
+		[32375] = {25,9,1},
+		[32376] = {25,8,1},
+		[32377] = {25,1,1},
+		[32385] = {20,1,1},
 		[32389] = {[3] = 11,[4] = 40023},
 		[32390] = {[3] = 11,[4] = 40024},
 		[32391] = {[3] = 11,[4] = 40020},
@@ -3361,17 +3382,17 @@ local SOURCE_DATA = {
 		[32402] = {[3] = 5,[4] = 40033},
 		[32403] = {[3] = 5,[4] = 40034},
 		[32404] = {[3] = 5,[4] = 40035},
-		[32405] = {22,4,1},
+		[32405] = {23,4,1},
 		[32409] = {[3] = 17,[4] = 39961},
 		[32410] = {[3] = 17,[4] = 39963},
 		[32413] = {[3] = 12,[4] = 39973},
 		[32420] = {[3] = 11,[4] = 40060},
 		[32423] = {[3] = 12,[4] = 39971},
-		[32428] = {{23,6,1},{24,10,1}},
-		[32458] = {22,4,1},
-		[32459] = {23,1,1},
+		[32428] = {{24,6,1},{25,10,1}},
+		[32458] = {23,4,1},
+		[32459] = {24,1,1},
 		[32461] = {[3] = 12,[4] = 40274},
-		[32471] = {24,9,1},
+		[32471] = {25,9,1},
 		[32472] = {[3] = 12,[4] = 41311},
 		[32473] = {[3] = 12,[4] = 41312},
 		[32474] = {[3] = 12,[4] = 41314},
@@ -3380,29 +3401,29 @@ local SOURCE_DATA = {
 		[32478] = {[3] = 12,[4] = 41317},
 		[32479] = {[3] = 12,[4] = 41318},
 		[32480] = {[3] = 12,[4] = 41319},
-		[32483] = {24,9,1},
+		[32483] = {25,9,1},
 		[32494] = {[3] = 12,[4] = 41320},
 		[32495] = {[3] = 12,[4] = 41321},
-		[32496] = {24,9,1},
-		[32497] = {24,9,1},
-		[32500] = {24,9,1},
-		[32501] = {24,5,1},
-		[32505] = {24,8,1},
+		[32496] = {25,9,1},
+		[32497] = {25,9,1},
+		[32500] = {25,9,1},
+		[32501] = {25,5,1},
+		[32505] = {25,8,1},
 		[32508] = {[3] = 17,[4] = 40514},
-		[32510] = {24,4,1},
-		[32512] = {24,4,1},
-		[32513] = {24,3,1},
-		[32515] = {22,2,1},
-		[32516] = {21,1,1},
-		[32517] = {24,6,1},
-		[32518] = {24,8,1},
-		[32519] = {24,8,1},
-		[32521] = {24,9,1},
-		[32524] = {24,9,1},
-		[32525] = {24,9,1},
-		[32526] = {24,10,1},
-		[32527] = {24,10,1},
-		[32528] = {24,10,1},
+		[32510] = {25,4,1},
+		[32512] = {25,4,1},
+		[32513] = {25,3,1},
+		[32515] = {23,2,1},
+		[32516] = {22,1,1},
+		[32517] = {25,6,1},
+		[32518] = {25,8,1},
+		[32519] = {25,8,1},
+		[32521] = {25,9,1},
+		[32524] = {25,9,1},
+		[32525] = {25,9,1},
+		[32526] = {25,10,1},
+		[32527] = {25,10,1},
+		[32528] = {25,10,1},
 		[32568] = {[3] = 5,[4] = 41132},
 		[32570] = {[3] = 5,[4] = 41133},
 		[32571] = {[3] = 5,[4] = 41134},
@@ -3419,30 +3440,30 @@ local SOURCE_DATA = {
 		[32585] = {[3] = 11,[4] = 41208},
 		[32586] = {[3] = 11,[4] = 41205},
 		[32587] = {[3] = 11,[4] = 41206},
-		[32589] = {{23,6,1},{24,10,1}},
-		[32590] = {{23,6,1},{24,10,1}},
-		[32591] = {{23,6,1},{24,10,1}},
-		[32592] = {{23,6,1},{24,10,1}},
-		[32593] = {24,10,1},
-		[32606] = {24,10,1},
-		[32608] = {24,10,1},
-		[32609] = {{23,6,1},{24,10,1}},
-		[32736] = {24,11,1},
-		[32737] = {24,11,1},
-		[32738] = {24,11,1},
-		[32739] = {24,11,1},
-		[32744] = {24,11,1},
-		[32745] = {24,11,1},
-		[32746] = {24,11,1},
-		[32747] = {24,11,1},
-		[32748] = {24,11,1},
-		[32749] = {24,11,1},
-		[32750] = {24,11,1},
-		[32751] = {24,11,1},
-		[32752] = {24,11,1},
-		[32753] = {24,11,1},
-		[32754] = {24,11,1},
-		[32755] = {24,11,1},
+		[32589] = {{24,6,1},{25,10,1}},
+		[32590] = {{24,6,1},{25,10,1}},
+		[32591] = {{24,6,1},{25,10,1}},
+		[32592] = {{24,6,1},{25,10,1}},
+		[32593] = {25,10,1},
+		[32606] = {25,10,1},
+		[32608] = {25,10,1},
+		[32609] = {{24,6,1},{25,10,1}},
+		[32736] = {25,11,1},
+		[32737] = {25,11,1},
+		[32738] = {25,11,1},
+		[32739] = {25,11,1},
+		[32744] = {25,11,1},
+		[32745] = {25,11,1},
+		[32746] = {25,11,1},
+		[32747] = {25,11,1},
+		[32748] = {25,11,1},
+		[32749] = {25,11,1},
+		[32750] = {25,11,1},
+		[32751] = {25,11,1},
+		[32752] = {25,11,1},
+		[32753] = {25,11,1},
+		[32754] = {25,11,1},
+		[32755] = {25,11,1},
 		[32756] = {[3] = 12,[4] = 41307},
 		[32768] = {[1] = 6,[2] = 3,[3] = 1,[5] = 1},
 		[32769] = {[1] = 6,[2] = 3,[3] = 1,[5] = 1},
@@ -3455,25 +3476,25 @@ local SOURCE_DATA = {
 		[32781] = {[1] = 6,[2] = 3,[3] = 1,[5] = 1},
 		[32833] = {[3] = 17,[4] = 41420},
 		[32836] = {[3] = 17,[4] = 41429},
-		[32837] = {24,9,1},
-		[32838] = {24,9,1},
+		[32837] = {25,9,1},
+		[32838] = {25,9,1},
 		[32839] = {[3] = 7,[4] = 41458},
 		[32849] = {[3] = 7,[4] = 41500},
 		[32850] = {[3] = 7,[4] = 41501},
 		[32851] = {[3] = 7,[4] = 41502},
 		[32852] = {[3] = 7,[4] = 41503},
 		[32854] = {[3] = 5,[4] = 43846},
-		[32897] = {{21,7,1},{22,6,1},{23,6,1},{24,10,1}},
-		[32943] = {24,10,1},
-		[32944] = {22,1,1},
-		[32945] = {23,6,1},
-		[32946] = {23,6,1},
+		[32897] = {{22,7,1},{23,6,1},{24,6,1},{25,10,1}},
+		[32943] = {25,10,1},
+		[32944] = {23,1,1},
+		[32945] = {24,6,1},
+		[32946] = {24,6,1},
 		[33048] = {[3] = 9,[4] = 42296},
 		[33052] = {[3] = 9,[4] = 42302},
 		[33053] = {[3] = 9,[4] = 42305},
-		[33054] = {21,2,1},
-		[33055] = {21,1,1},
-		[33058] = {21,5,1},
+		[33054] = {22,2,1},
+		[33055] = {22,1,1},
+		[33058] = {22,5,1},
 		[33092] = {[3] = 12,[4] = 30551},
 		[33093] = {[3] = 12,[4] = 30552},
 		[33102] = {18,6,1},
@@ -3593,10 +3614,10 @@ local SOURCE_DATA = {
 		[33933] = {18,8,1},
 		[33971] = {18,7,1},
 		[33993] = {18,8,1},
-		[34009] = {{23,6,1},{24,10,1}},
-		[34010] = {23,6,1},
-		[34011] = {24,10,1},
-		[34012] = {24,10,1},
+		[34009] = {{24,6,1},{25,10,1}},
+		[34010] = {24,6,1},
+		[34011] = {25,10,1},
+		[34012] = {25,10,1},
 		[34029] = {18,5,1},
 		[34060] = {[3] = 12,[4] = 44155},
 		[34061] = {[3] = 12,[4] = 44157},
@@ -3609,88 +3630,88 @@ local SOURCE_DATA = {
 		[34106] = {[3] = 6,[4] = 44768},
 		[34113] = {[3] = 12,[4] = 44391},
 		[34157] = {16,4,1},
-		[34164] = {25,1,1},
-		[34165] = {25,1,1},
-		[34166] = {25,1,1},
-		[34167] = {25,1,1},
-		[34168] = {25,1,1},
-		[34169] = {25,1,1},
-		[34170] = {25,1,1},
-		[34176] = {25,2,1},
-		[34177] = {25,2,1},
-		[34178] = {25,2,1},
-		[34179] = {25,2,1},
-		[34180] = {25,2,1},
-		[34181] = {25,2,1},
-		[34182] = {25,3,1},
-		[34183] = {25,8,1},
-		[34184] = {25,3,1},
-		[34185] = {25,3,1},
-		[34186] = {25,3,1},
-		[34188] = {25,3,1},
-		[34189] = {25,4,1},
-		[34190] = {25,4,1},
-		[34192] = {25,4,1},
-		[34193] = {25,4,1},
-		[34194] = {25,4,1},
-		[34195] = {25,4,1},
-		[34196] = {25,4,1},
-		[34197] = {25,4,1},
-		[34198] = {25,4,1},
-		[34199] = {25,4,1},
-		[34202] = {25,4,1},
-		[34203] = {25,4,1},
-		[34204] = {25,4,1},
-		[34205] = {25,4,1},
-		[34206] = {25,4,1},
+		[34164] = {26,1,1},
+		[34165] = {26,1,1},
+		[34166] = {26,1,1},
+		[34167] = {26,1,1},
+		[34168] = {26,1,1},
+		[34169] = {26,1,1},
+		[34170] = {26,1,1},
+		[34176] = {26,2,1},
+		[34177] = {26,2,1},
+		[34178] = {26,2,1},
+		[34179] = {26,2,1},
+		[34180] = {26,2,1},
+		[34181] = {26,2,1},
+		[34182] = {26,3,1},
+		[34183] = {26,8,1},
+		[34184] = {26,3,1},
+		[34185] = {26,3,1},
+		[34186] = {26,3,1},
+		[34188] = {26,3,1},
+		[34189] = {26,4,1},
+		[34190] = {26,4,1},
+		[34192] = {26,4,1},
+		[34193] = {26,4,1},
+		[34194] = {26,4,1},
+		[34195] = {26,4,1},
+		[34196] = {26,4,1},
+		[34197] = {26,4,1},
+		[34198] = {26,4,1},
+		[34199] = {26,4,1},
+		[34202] = {26,4,1},
+		[34203] = {26,4,1},
+		[34204] = {26,4,1},
+		[34205] = {26,4,1},
+		[34206] = {26,4,1},
 		[34207] = {[3] = 6,[4] = 44770},
-		[34208] = {25,4,1},
-		[34209] = {25,4,1},
-		[34210] = {25,4,1},
-		[34211] = {25,5,1},
-		[34212] = {25,5,1},
-		[34213] = {25,5,1},
-		[34214] = {25,5,1},
-		[34215] = {25,5,1},
-		[34216] = {25,5,1},
+		[34208] = {26,4,1},
+		[34209] = {26,4,1},
+		[34210] = {26,4,1},
+		[34211] = {26,5,1},
+		[34212] = {26,5,1},
+		[34213] = {26,5,1},
+		[34214] = {26,5,1},
+		[34215] = {26,5,1},
+		[34216] = {26,5,1},
 		[34220] = {[3] = 17,[4] = 44794},
-		[34228] = {25,5,1},
-		[34229] = {25,5,1},
-		[34230] = {25,5,1},
-		[34231] = {25,5,1},
-		[34232] = {25,5,1},
-		[34233] = {25,5,1},
-		[34234] = {25,5,1},
-		[34240] = {25,5,1},
-		[34241] = {25,6,1},
-		[34242] = {25,6,1},
-		[34243] = {25,6,1},
-		[34244] = {25,6,1},
-		[34245] = {25,6,1},
-		[34247] = {25,6,1},
-		[34329] = {25,6,1},
+		[34228] = {26,5,1},
+		[34229] = {26,5,1},
+		[34230] = {26,5,1},
+		[34231] = {26,5,1},
+		[34232] = {26,5,1},
+		[34233] = {26,5,1},
+		[34234] = {26,5,1},
+		[34240] = {26,5,1},
+		[34241] = {26,6,1},
+		[34242] = {26,6,1},
+		[34243] = {26,6,1},
+		[34244] = {26,6,1},
+		[34245] = {26,6,1},
+		[34247] = {26,6,1},
+		[34329] = {26,6,1},
 		[34330] = {[3] = 6,[4] = 44970},
-		[34331] = {25,6,1},
-		[34332] = {25,6,1},
-		[34333] = {25,6,1},
-		[34334] = {25,6,1},
-		[34335] = {25,6,1},
-		[34336] = {25,6,1},
-		[34337] = {25,6,1},
-		[34339] = {25,6,1},
-		[34340] = {25,6,1},
-		[34341] = {25,6,1},
-		[34342] = {25,6,1},
-		[34343] = {25,6,1},
-		[34344] = {25,6,1},
-		[34345] = {25,6,1},
-		[34346] = {25,8,1},
-		[34347] = {25,8,1},
-		[34348] = {25,8,1},
-		[34349] = {25,8,1},
-		[34350] = {25,8,1},
-		[34351] = {25,8,1},
-		[34352] = {25,3,1},
+		[34331] = {26,6,1},
+		[34332] = {26,6,1},
+		[34333] = {26,6,1},
+		[34334] = {26,6,1},
+		[34335] = {26,6,1},
+		[34336] = {26,6,1},
+		[34337] = {26,6,1},
+		[34339] = {26,6,1},
+		[34340] = {26,6,1},
+		[34341] = {26,6,1},
+		[34342] = {26,6,1},
+		[34343] = {26,6,1},
+		[34344] = {26,6,1},
+		[34345] = {26,6,1},
+		[34346] = {26,8,1},
+		[34347] = {26,8,1},
+		[34348] = {26,8,1},
+		[34349] = {26,8,1},
+		[34350] = {26,8,1},
+		[34351] = {26,8,1},
+		[34352] = {26,3,1},
 		[34353] = {[3] = 12,[4] = 46116},
 		[34354] = {[3] = 12,[4] = 46114},
 		[34355] = {[3] = 12,[4] = 46112},
@@ -3718,39 +3739,39 @@ local SOURCE_DATA = {
 		[34378] = {[3] = 5,[4] = 46141},
 		[34379] = {[3] = 5,[4] = 46142},
 		[34380] = {[3] = 5,[4] = 46140},
-		[34381] = {25,2,1},
-		[34382] = {25,1,1},
-		[34383] = {25,3,1},
-		[34384] = {25,1,1},
-		[34385] = {25,3,1},
-		[34386] = {25,1,1},
-		[34388] = {25,4,1},
-		[34389] = {25,4,1},
-		[34390] = {25,4,1},
-		[34391] = {25,4,1},
-		[34392] = {25,4,1},
-		[34393] = {25,4,1},
-		[34394] = {25,5,1},
-		[34395] = {25,5,1},
-		[34396] = {25,5,1},
-		[34397] = {25,5,1},
-		[34398] = {25,5,1},
-		[34399] = {25,5,1},
-		[34400] = {25,6,1},
-		[34401] = {25,6,1},
-		[34402] = {25,6,1},
-		[34403] = {25,6,1},
-		[34404] = {25,6,1},
-		[34405] = {25,6,1},
-		[34406] = {25,6,1},
-		[34407] = {25,8,1},
-		[34408] = {25,5,1},
-		[34409] = {25,8,1},
+		[34381] = {26,2,1},
+		[34382] = {26,1,1},
+		[34383] = {26,3,1},
+		[34384] = {26,1,1},
+		[34385] = {26,3,1},
+		[34386] = {26,1,1},
+		[34388] = {26,4,1},
+		[34389] = {26,4,1},
+		[34390] = {26,4,1},
+		[34391] = {26,4,1},
+		[34392] = {26,4,1},
+		[34393] = {26,4,1},
+		[34394] = {26,5,1},
+		[34395] = {26,5,1},
+		[34396] = {26,5,1},
+		[34397] = {26,5,1},
+		[34398] = {26,5,1},
+		[34399] = {26,5,1},
+		[34400] = {26,6,1},
+		[34401] = {26,6,1},
+		[34402] = {26,6,1},
+		[34403] = {26,6,1},
+		[34404] = {26,6,1},
+		[34405] = {26,6,1},
+		[34406] = {26,6,1},
+		[34407] = {26,8,1},
+		[34408] = {26,5,1},
+		[34409] = {26,8,1},
 		[34411] = {[3] = 9,[4] = 45022},
-		[34427] = {25,5,1},
-		[34428] = {25,5,1},
-		[34429] = {25,5,1},
-		[34430] = {25,5,1},
+		[34427] = {26,5,1},
+		[34428] = {26,5,1},
+		[34429] = {26,5,1},
+		[34430] = {26,5,1},
 		[34431] = 34848,
 		[34432] = 34848,
 		[34433] = 34848,
@@ -3827,7 +3848,7 @@ local SOURCE_DATA = {
 		[34615] = {[1] = 16,[2] = 4,[3] = 1,[5] = 1},
 		[34616] = {[1] = 16,[2] = 4,[3] = 1,[5] = 1},
 		[34625] = {16,4,1},
-		[34664] = {25,8,1},
+		[34664] = {26,8,1},
 		[34697] = {16,1,1},
 		[34698] = {16,1,1},
 		[34699] = {16,1,1},
@@ -3858,65 +3879,65 @@ local SOURCE_DATA = {
 		[34809] = {16,4,1},
 		[34810] = {16,4,1},
 		[34832] = {[3] = 9,[4] = 45695},
-		[34845] = {19,1,1},
-		[34846] = {19,1,1},
+		[34845] = {20,1,1},
+		[34846] = {20,1,1},
 		[34847] = {[3] = 12,[4] = 46111},
-		[34848] = {25,1,1},
-		[34851] = {25,1,1},
-		[34852] = {25,1,1},
-		[34853] = {25,2,1},
-		[34854] = {25,2,1},
-		[34855] = {25,2,1},
-		[34856] = {25,3,1},
-		[34857] = {25,3,1},
-		[34858] = {25,3,1},
+		[34848] = {26,1,1},
+		[34851] = {26,1,1},
+		[34852] = {26,1,1},
+		[34853] = {26,2,1},
+		[34854] = {26,2,1},
+		[34855] = {26,2,1},
+		[34856] = {26,3,1},
+		[34857] = {26,3,1},
+		[34858] = {26,3,1},
 		[35128] = {[3] = 10,[4] = 46353},
 		[35181] = {[3] = 12,[4] = 46108},
 		[35182] = {[3] = 12,[4] = 46109},
 		[35183] = {[3] = 12,[4] = 46106},
 		[35184] = {[3] = 12,[4] = 46110},
 		[35185] = {[3] = 12,[4] = 46107},
-		[35186] = {25,7,1},
-		[35187] = {25,7,1},
-		[35189] = {25,7,1},
-		[35190] = {25,7,1},
-		[35191] = {25,7,1},
-		[35192] = {25,7,1},
-		[35193] = {25,7,1},
-		[35194] = {25,7,1},
-		[35195] = {25,7,1},
-		[35196] = {25,7,1},
-		[35197] = {25,7,1},
-		[35198] = {25,7,1},
-		[35199] = {25,7,1},
-		[35200] = {25,7,1},
-		[35201] = {25,7,1},
-		[35202] = {25,7,1},
-		[35203] = {25,7,1},
-		[35204] = {25,7,1},
-		[35205] = {25,7,1},
-		[35206] = {25,7,1},
-		[35207] = {25,7,1},
-		[35208] = {25,8,1},
-		[35209] = {25,8,1},
-		[35210] = {25,8,1},
-		[35211] = {25,8,1},
-		[35212] = {25,7,1},
-		[35213] = {25,7,1},
-		[35214] = {25,7,1},
-		[35215] = {25,7,1},
-		[35216] = {25,7,1},
-		[35217] = {25,7,1},
-		[35218] = {25,7,1},
-		[35219] = {25,7,1},
-		[35273] = {25,8,1},
+		[35186] = {26,7,1},
+		[35187] = {26,7,1},
+		[35189] = {26,7,1},
+		[35190] = {26,7,1},
+		[35191] = {26,7,1},
+		[35192] = {26,7,1},
+		[35193] = {26,7,1},
+		[35194] = {26,7,1},
+		[35195] = {26,7,1},
+		[35196] = {26,7,1},
+		[35197] = {26,7,1},
+		[35198] = {26,7,1},
+		[35199] = {26,7,1},
+		[35200] = {26,7,1},
+		[35201] = {26,7,1},
+		[35202] = {26,7,1},
+		[35203] = {26,7,1},
+		[35204] = {26,7,1},
+		[35205] = {26,7,1},
+		[35206] = {26,7,1},
+		[35207] = {26,7,1},
+		[35208] = {26,8,1},
+		[35209] = {26,8,1},
+		[35210] = {26,8,1},
+		[35211] = {26,8,1},
+		[35212] = {26,7,1},
+		[35213] = {26,7,1},
+		[35214] = {26,7,1},
+		[35215] = {26,7,1},
+		[35216] = {26,7,1},
+		[35217] = {26,7,1},
+		[35218] = {26,7,1},
+		[35219] = {26,7,1},
+		[35273] = {26,8,1},
 		[35275] = {{[1] = 16,[2] = 1,[3] = 1,[5] = 1},{[1] = 16,[2] = 2,[3] = 1,[5] = 1},{[1] = 16,[2] = 3,[3] = 1,[5] = 1}},
-		[35282] = {25,5,1},
-		[35283] = {25,5,1},
-		[35284] = {25,5,1},
-		[35290] = {25,4,1},
-		[35291] = {25,4,1},
-		[35292] = {25,4,1},
+		[35282] = {26,5,1},
+		[35283] = {26,5,1},
+		[35284] = {26,5,1},
+		[35290] = {26,4,1},
+		[35291] = {26,4,1},
+		[35292] = {26,4,1},
 		[35304] = {16,4,1},
 		[35311] = {16,4,1},
 		[35315] = {[3] = 17,[4] = 46403},
@@ -3937,7 +3958,7 @@ local SOURCE_DATA = {
 		[35702] = {[3] = 17,[4] = 46778},
 		[35703] = {[3] = 17,[4] = 46779},
 		[35707] = {[3] = 17,[4] = 46803},
-		[35733] = {25,8,1},
+		[35733] = {26,8,1},
 		[35748] = {[3] = 7,[4] = 47046},
 		[35749] = {[3] = 7,[4] = 47048},
 		[35750] = {[3] = 7,[4] = 47049},
diff --git a/AtlasLootClassic_DungeonsAndRaids/data-tbc.lua b/AtlasLootClassic_DungeonsAndRaids/data-tbc.lua
index 401a88a7..42862f8a 100644
--- a/AtlasLootClassic_DungeonsAndRaids/data-tbc.lua
+++ b/AtlasLootClassic_DungeonsAndRaids/data-tbc.lua
@@ -2885,6 +2885,49 @@ data["ZulAman"] = {
 }
 
 
+data["WorldBossesBC"] = {
+	name = AL["World Bosses"],
+	ContentType = RAID25_CONTENT,
+	items = {
+        { -- DDoomwalker
+            name = AL["Doomwalker"],
+            npcID = 17711,
+            Level = 999,
+            DisplayIDs = {{21435}},
+            [NORMAL_DIFF] = {
+                { 1, 30729 }, -- Black-Iron Battlecloak
+                { 2, 30725 }, -- Anger-Spark Gloves
+                { 3, 30727 }, -- Gilded Trousers of Benediction
+                { 4, 30730 }, -- Terrorweave Tunic
+                { 5, 30728 }, -- Fathom-Helm of the Deeps
+                { 6, 30731 }, -- Faceguard of the Endless Watch
+                { 7, 30726 }, -- Archaic Charm of Presence
+                { 8, 30723 }, -- Talon of the Tempest
+                { 9, 30722 }, -- Ethereum Nexus-Reaver
+                { 10, 30724 }, -- Barrel-Blade Longrifle
+            }
+        },
+        { -- KKruul
+            name = AL["Doom Lord Kazzak"],
+            npcID = 18728,
+            Level = 999,
+            DisplayIDs = {{17887}},
+            [NORMAL_DIFF] = {
+                { 1, 30735 }, -- Ancient Spellcloak of the Highborne
+                { 2, 30734 }, -- Leggings of the Seventh Circle
+                { 3, 30737 }, -- Gold-Leaf Wildboots
+                { 4, 30739 }, -- Scaled Greaves of the Marksman
+                { 5, 30740 }, -- Ripfiend Shoulderplates
+                { 6, 30741 }, -- Topaz-Studded Battlegrips
+                { 7, 30736 }, -- Ring of Flowing Light
+                { 8, 30738 }, -- Ring of Reciprocity
+                { 9, 30733 }, -- Hope Ender
+                { 10, 30732 }, -- Exodar Life-Staff
+            }
+        }
+	}
+}
+
 data["MagtheridonsLair"] = {
 	MapID = 3836,
 	InstanceID = 544,
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d5bd655..43439d4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ This mod is distributed under Version 2 of the GPL.  A copy of the GPL is includ
 - reimplement a basic class filter for loot pages
 - add source tooltip support for tokens
 - add average item level and class icons for item sets
+- add missing profession ranks
 - (classic) move Lady Falther'ess from Razorfen Downs into extra list and mark as Scourge Invasions npc
 - (classic) add class icons for tokens from: Nax, AQ40, AQ20, ZG
 - (bc) add bc support
@@ -18,3 +19,4 @@ This mod is distributed under Version 2 of the GPL.  A copy of the GPL is includ
 - (bc) add tooltip source support
 - (bc) add item sets data
 - (bc) add profession and recipe data
+- (bc) add world bosses