diff --git a/ACID/acid_tbc.sql b/ACID/acid_tbc.sql
index 2422e5670..c2580e2ff 100644
--- a/ACID/acid_tbc.sql
+++ b/ACID/acid_tbc.sql
@@ -26552,7 +26552,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 -- Tempest Keep: The Botanica - (4.3.4 Official Data - Normal/Heroic)
 -- ==================================================================
 -- High Botanist Freywinn (17975) - boss_high_botanist_freywinn
--- Commander Sarannis 17976 (4.3.4 Official Data - Normal/Heroic) - (Adds Summon Spell: 34803 / Casts - 34810 (NPC: 20083 5 Yards Behind) and 34817 / 34818 / 34819 (NPC: 20078 5 Yards Sides and Front)
+-- Commander Sarannis 17976 - spell_list
 ('1797601','17976','11','0','100','0','0','0','0','0','0','0','11','19818','0','34','11','34792','0','34','0','0','0','0','Commander Sarannis - Cast Double Attack and Arcane Resonance on Spawn'),
 ('1797602','17976','4','0','100','0','0','0','0','0','0','0','1','19936','0','0','0','0','0','0','0','0','0','0','Commander Sarannis - Yell on Aggro'),
 ('1797603','17976','6','0','100','0','0','0','0','0','0','0','1','19942','0','0','0','0','0','0','0','0','0','0','Commander Sarannis - Yell on Death'),
@@ -26582,7 +26582,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 -- Sunseeker Botanist - spell_list - guid based rp scriots
 ('5530068','-5530068','1','0','100','1','0','20000','50000','80000','0','0','53','5530012','0','0','0','0','0','0','0','0','0','0','Sunseeker Botanist - Start RelayScript'),
 ('5530069','-5530069','1','0','100','1','0','20000','50000','80000','0','0','53','5530012','0','0','0','0','0','0','0','0','0','0','Sunseeker Botanist - Start RelayScript'),
--- Frayer (4.3.4 Official Data - Normal/Heroic)
+-- Frayer 18587
 ('1858701','18587','8','0','100','1','34167','-1','1000','1000','0','0','11','34202','0','33','0','0','0','0','0','0','0','0','Frayer - Cast Frost Form on Blizzard SpellHit'),
 ('1858702','18587','8','0','100','1','34169','-1','1000','1000','0','0','11','34203','0','33','0','0','0','0','0','0','0','0','Frayer - Cast Fire Form on Rain of Fire SpellHit'),
 ('1858703','18587','8','0','100','1','34170','-1','1000','1000','0','0','11','34204','0','33','0','0','0','0','0','0','0','0','Frayer - Cast Arcane Form on Arcane Explosion SpellHit'),
@@ -26595,36 +26595,29 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 -- Sunseeker Gene-Splicer - spell_list
 -- Sunseeker Herbalist - spell_list
 -- Sunseeker Harvester - spell_list
--- Nethervine Inciter (19511,21563) - creature_spell_list
+-- Nethervine Inciter (19511,21563) - spell_list
 ('1951101','19511','8','0','100','1','34222','-1','0','0','0','0','11','34173','0','0','0','0','0','0','0','0','0','0','Nethervine Inciter - Cast Sunseeker Blessing on Sunseeker Blessing Spellhit'),
--- Nethervine Reaper 19512 (4.3.4 Official Data - Normal/Heroic)
+-- Nethervine Reaper 19512 - spell_list
 ('1951201','19512','8','0','100','1','34222','-1','0','0','0','0','11','34173','0','0','0','0','0','0','0','0','0','0','Nethervine Reaper - Cast Sunseeker Blessing on Sunseeker Blessing Spellhit'),
 -- Mutate Fear-Shrieker - spell_list
 -- Greater Frayer - spell_list
 -- Mutate Fleshlasher - spell_list
--- Frayer Wildling (4.3.4 Official Data - Normal/Heroic)
-('1960801','19608','0','0','100','1027','4200','8100','4100','10200','0','0','11','34644','1','0','0','0','0','0','0','0','0','0','Frayer Wildling (Normal) - Cast Lash'),
-('1960802','19608','0','0','100','1029','4200','8100','4100','8300','0','0','11','39122','1','0','0','0','0','0','0','0','0','0','Frayer Wildling (Heroic) - Cast Lash'),
+-- Frayer Wildling - spell_list
 -- Bloodwarder Mender 19633 - spell_list
 ('1963301','19633','27','0','100','1','34809','1','15000','30000','0','0','11','34809','0','0','0','0','0','0','0','0','0','0','Bloodwarder Mender - Cast Holy Fury on Missing Buff'),
--- Nethervine Trickster (4.3.4 Official Data - Normal/Heroic)
+-- Nethervine Trickster 
 ('1984301','19843','1','0','100','0','1000','1000','0','0','0','0','11','30831','0','32','0','0','0','0','0','0','0','0','Nethervine Trickster - Cast Stealth OOC'),
 ('1984302','19843','33','0','100','1025','0','0','4100','9700','0','0','11','34614','1','0','0','0','0','0','0','0','0','0','Nethervine Trickster - Cast Backstab on Facing Target Back'),
 -- Mutate Horror (19865) - NSR
--- Thorn Lasher (4.3.4 Official Data - Normal/Heroic)
-('1991901','19919','9','0','100','1025','0','35','5000','10000','0','0','11','35071','1','0','0','0','0','0','0','0','0','0','Thorn Lasher - Cast Thorn Missiles'),
--- Thorn Flayer (4.3.4 Official Data - Normal/Heroic)
-('1992001','19920','9','0','100','1025','0','35','9600','15700','0','0','11','35507','1','0','0','0','0','0','0','0','0','0','Thorn Flayer - Cast Mind Flay'),
+-- Thorn Lasher - spell_list
+-- Thorn Flayer - spell_list
 -- Sapling (19949) - mob_warp_splinter_treant
--- Frayer Protector 19953 (4.3.4 Official Data - Normal/Heroic)
-('1995301','19953','4','0','100','0','0','0','0','0','0','0','57','2','25','0','0','0','0','0','0','0','0','0','Frayer Protector - Enable Range Mode on Aggro'),
-('1995302','19953','9','0','100','1025','5','30','2300','3900','0','0','11','34745','1','256','0','0','0','0','0','0','0','0','Frayer Protector - Cast Shoot Thorns'),
--- White Seedling (4.3.4 Official Data - Normal/Heroic)
-('1995801','19958','9','0','100','1025','0','5','500','500','0','0','11','34752','1','32','0','0','0','0','0','0','0','0','White Seedling - Cast Freezing Touch'),
+-- Frayer Protector 19953 - spell_list
+('1995301','19953','11','0','100','0','0','0','0','0','0','0','57','2','25','0','0','0','0','0','0','0','0','0','Frayer Protector - Enable Range Mode on Spawn'),
+-- White Seedling - spell_list
 -- Blue Seedling
 ('1996201','19962','11','0','100','0','0','0','0','0','0','0','11','34781','0','0','0','0','0','0','0','0','0','0','Green Seedling - Cast Bind Feet on Spawn'),
--- Red Seedling (4.3.4 Official Data - Normal/Heroic)
-('1996401','19964','9','0','100','1025','0','20','2400','4800','0','0','11','36339','1','0','0','0','0','0','0','0','0','0','Red Seedling - Cast Fire Blast'),
+-- Red Seedling - spell_list
 -- Green Seedling (4.3.4 Official Data - Normal/Heroic)
 ('1996901','19969','11','0','100','0','0','0','0','0','0','0','11','34757','0','0','0','0','0','0','0','0','0','0','Green Seedling - Cast Toxic Pollen on Spawn'),
 ('1996902','19969','6','0','100','0','0','0','0','0','0','0','28','0','34757','0','0','0','0','0','0','0','0','0','Green Seedling - Remove Toxic Pollen on Death'),
diff --git a/Updates/0395_bota_spell_list.sql b/Updates/0395_bota_spell_list.sql
index caa51f6ff..576168a0c 100644
--- a/Updates/0395_bota_spell_list.sql
+++ b/Updates/0395_bota_spell_list.sql
@@ -411,3 +411,110 @@ INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `Combat
 
 UPDATE `creature_template` SET `SpellList` = 2535401 WHERE `entry` = 25354;
 
+
+-- Frayer Wildling 19608
+DELETE FROM `creature_template_spells` WHERE `entry` IN (19608, 21554);
+
+DELETE FROM `creature_spell_list_entry` WHERE `Id` IN (1960801, 2155401);
+INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
+(1960801, 'Botanica - Frayer Wildling - Normal', 0, 0),
+(2155401, 'Botanica - Frayer Wildling - Heroic', 0, 0);
+
+DELETE FROM `creature_spell_list` WHERE `Id` IN (1960801, 2155401);
+INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
+(1960801, 1, 34644, 0, -1, 1, 0, 100, 0, 4000, 12000, 6000, 14000, 'Frayer Wildling - Lash - current'),
+(2155401, 1, 39122, 0, -1, 1, 0, 100, 0, 4000, 12000, 6000, 14000, 'Frayer Wildling - Lash - current');
+
+
+UPDATE `creature_template` SET `SpellList` = 1960801 WHERE `entry` = 19608;
+UPDATE `creature_template` SET `SpellList` = 2155401 WHERE `entry` = 21554;
+
+-- Thorn Lasher 19919
+DELETE FROM `creature_template_spells` WHERE `entry` IN (19919, 21580);
+
+DELETE FROM `creature_spell_list_entry` WHERE `Id` IN (1991901, 2158001);
+INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
+(1991901, 'Botanica - Thorn Lasher - Normal', 0, 0),
+(2158001, 'Botanica - Thorn Lasher - Heroic', 0, 0);
+
+DELETE FROM `creature_spell_list` WHERE `Id` IN (1991901, 2158001);
+INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
+(1991901, 1, 35071, 0, -1, 1, 0, 100, 0, 0, 2000, 2000, 4000, 'Thorn Lasher - Thorn Missiles - current'),
+(2158001, 1, 35071, 0, -1, 1, 0, 100, 0, 0, 2000, 2000, 4000, 'Thorn Lasher - Thorn Missiles - current');
+
+
+UPDATE `creature_template` SET `SpellList` = 1991901 WHERE `entry` = 19919;
+UPDATE `creature_template` SET `SpellList` = 2158001 WHERE `entry` = 21580;
+
+-- Thorn Flayer 19920
+DELETE FROM `creature_template_spells` WHERE `entry` IN (19920, 21579);
+
+DELETE FROM `creature_spell_list_entry` WHERE `Id` IN (1992001, 2157901);
+INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
+(1992001, 'Botanica - Thorn Flayer - Normal', 0, 0),
+(2157901, 'Botanica - Thorn Flayer - Heroic', 0, 0);
+
+DELETE FROM `creature_spell_list` WHERE `Id` IN (1992001, 2157901);
+INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
+(1992001, 1, 35507, 0, -1, 1, 0, 100, 0, 0, 5000, 5000, 8000, 'Thorn Flayer - Mind Flay - current'),
+(2157901, 1, 35507, 0, -1, 1, 0, 100, 0, 0, 5000, 5000, 8000, 'Thorn Flayer - Mind Flay - current');
+
+
+UPDATE `creature_template` SET `SpellList` = 1992001 WHERE `entry` = 19920;
+UPDATE `creature_template` SET `SpellList` = 2157901 WHERE `entry` = 21579;
+
+-- Frayer Protector 19953
+DELETE FROM `creature_template_spells` WHERE `entry` IN (19953, 21553);
+
+DELETE FROM `creature_spell_list_entry` WHERE `Id` IN (1995301, 2155301);
+INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
+(1995301, 'Botanica - Frayer Protector - Normal', 0, 0),
+(2155301, 'Botanica - Frayer Protector - Heroic', 0, 0);
+
+DELETE FROM `creature_spell_list` WHERE `Id` IN (1995301, 2155301);
+INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
+(1995301, 1, 34745, 0, -1, 1, 0, 100, 0, 0, 2000, 2000, 4000, 'Frayer Protector - Shoot Thorns - current'),
+(2155301, 1, 34745, 0, -1, 1, 0, 100, 0, 0, 2000, 2000, 4000, 'Frayer Protector - Shoot Thorns - current');
+
+
+UPDATE `creature_template` SET `SpellList` = 1995301 WHERE `entry` = 19953;
+UPDATE `creature_template` SET `SpellList` = 2155301 WHERE `entry` = 21553;
+
+-- White Seedling 19958
+DELETE FROM `creature_template_spells` WHERE `entry` IN (19958, 21583);
+
+DELETE FROM `creature_spell_list_entry` WHERE `Id` IN (1995801, 2158301);
+INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
+(1995801, 'Botanica - White Seedling - Normal', 0, 0),
+(2158301, 'Botanica - White Seedling - Heroic', 0, 0);
+
+DELETE FROM `creature_spell_list` WHERE `Id` IN (1995801, 2158301);
+INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
+(1995801, 1, 34752, 0, -1, 1, 0, 100, 0, 5000, 7000, 4000, 13000, 'White Seedling - Freezing Touch - current'),
+(2158301, 1, 34752, 0, -1, 1, 0, 100, 0, 5000, 7000, 4000, 13000, 'White Seedling - Freezing Touch - current');
+
+
+UPDATE `creature_template` SET `SpellList` = 1995801 WHERE `entry` = 19958;
+UPDATE `creature_template` SET `SpellList` = 2158301 WHERE `entry` = 21583;
+
+
+-- Red Seedling 19964
+DELETE FROM `creature_template_spells` WHERE `entry` IN (19964, 21566);
+
+DELETE FROM `creature_spell_list_entry` WHERE `Id` IN (1996401, 2156601);
+INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
+(1996401, 'Botanica - Red Seedling - Normal', 0, 0),
+(2156601, 'Botanica - Red Seedling - Heroic', 0, 0);
+
+DELETE FROM `creature_spell_list` WHERE `Id` IN (1996401, 2156601);
+INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
+(1996401, 1, 36339, 0, -1, 1, 0, 100, 0, 2000, 6000, 2000, 6000, 'Red Seedling - Fire Blast - current'),
+(2156601, 1, 36339, 0, -1, 1, 0, 100, 0, 2000, 6000, 2000, 6000, 'Red Seedling - Fire Blast - current');
+
+
+UPDATE `creature_template` SET `SpellList` = 1996401 WHERE `entry` = 19964;
+UPDATE `creature_template` SET `SpellList` = 2156601 WHERE `entry` = 21566;
+
+
+
+
diff --git a/Updates/Instances/553_botanica.sql b/Updates/Instances/553_botanica.sql
index 695eb380c..3a24c177c 100644
--- a/Updates/Instances/553_botanica.sql
+++ b/Updates/Instances/553_botanica.sql
@@ -232,25 +232,7 @@ REPLACE INTO `creature_template_addon` (`entry`, `mount`, `stand_state`, `sheath
 (17976, 0, 0, 1, 0, 0, '19818 34792'), -- Commander Sarannis
 (19843, 0, 0, 1, 0, 0, '30831'); -- Nethervine Trickster
 
-INSERT INTO `creature_linking` (`guid`, `master_guid`, `flag`) VALUES
-(@CGUID+157, @CGUID+158, 1155), -- Frayer Wildling -> Frayer Wildling
-(@CGUID+159, @CGUID+158, 1155), -- Frayer Wildling -> Frayer Wildling
-(@CGUID+160, @CGUID+158, 1155), -- Frayer Wildling -> Frayer Wildling
-(@CGUID+161, @CGUID+158, 1155), -- Frayer Wildling -> Frayer Wildling
-(@CGUID+162, @CGUID+158, 1155), -- Frayer Wildling -> Frayer Wildling
-(@CGUID+163, @CGUID+158, 1155), -- Frayer Wildling -> Frayer Wildling
-(@CGUID+164, @CGUID+158, 1155), -- Frayer Wildling -> Frayer Wildling
-(@CGUID+165, @CGUID+158, 1155), -- Frayer Wildling -> Frayer Wildling
-(@CGUID+166, @CGUID+158, 1155), -- Frayer Wildling -> Frayer Wildling
-(@CGUID+167, @CGUID+175, 1155), -- Frayer Wildling -> Frayer Wildling
-(@CGUID+168, @CGUID+175, 1155), -- Frayer Wildling -> Frayer Wildling
-(@CGUID+169, @CGUID+175, 1155), -- Frayer Wildling -> Frayer Wildling
-(@CGUID+170, @CGUID+175, 1155), -- Frayer Wildling -> Frayer Wildling
-(@CGUID+171, @CGUID+175, 1155), -- Frayer Wildling -> Frayer Wildling
-(@CGUID+172, @CGUID+175, 1155), -- Frayer Wildling -> Frayer Wildling
-(@CGUID+173, @CGUID+175, 1155), -- Frayer Wildling -> Frayer Wildling
-(@CGUID+174, @CGUID+175, 1155), -- Frayer Wildling -> Frayer Wildling
-(@CGUID+176, @CGUID+175, 1155); -- Frayer Wildling -> Frayer Wildling
+-- INSERT INTO `creature_linking` (`guid`, `master_guid`, `flag`) VALUES
 
 -- REPLACE INTO `creature_linking_template` (`entry`, `map`, `master_entry`, `flag`, `search_range`) VALUES
 
@@ -552,7 +534,6 @@ INSERT INTO `creature_spawn_data_template` (`Entry`, `UnitFlags`, `Faction`, `St
 -- [27] Flags: 33587264 - UNIT_FLAG_UNINTERACTIBLE - UNIT_FLAG_SWIMMING - UNIT_FLAG_UNK_6
 ('1950701', '33587264', '190', '0', 'The Botanica - Sunseeker Gene-Splicer');
 
-
 -- ============
 -- SPAWN GROUPS
 -- ============
@@ -596,7 +577,9 @@ INSERT INTO `spawn_group` (`Id`, `Name`, `Type`, `MaxCount`, `WorldState`, `Worl
 (@SGGUID+36, 'The Botanica - Group 036 - Mutate Horror (2) - Mutate Fear-Shrieker (2)', 0, 0, 0, 0, 1, 0),
 (@SGGUID+37, 'The Botanica - Group 037 - Mutate Horror (2) - Mutate Fear-Shrieker (2)', 0, 0, 0, 0, 1, 0),
 (@SGGUID+38, 'The Botanica - Group 038 - Mutate Horror (2) - Mutate Fear-Shrieker (2)', 0, 0, 0, 0, 1, 0),
-(@SGGUID+39, 'The Botanica - Group 039 - Bloodwarder Protector (2)', 0, 0, 0, 0, 1, @STRINGID+19);
+(@SGGUID+39, 'The Botanica - Group 039 - Bloodwarder Protector (2)', 0, 0, 0, 0, 1, @STRINGID+19),
+(@SGGUID+40, 'The Botanica - Group 040 - Frayer Wildling (10)', 0, 0, 0, 0, 1, 0),
+(@SGGUID+41, 'The Botanica - Group 041 - Frayer Wildling (10)', 0, 0, 0, 0, 1, 0);
 
 INSERT INTO `spawn_group_entry` (`Id`, `Entry`, `MinCount`, `MaxCount`, `Chance`) VALUES
 (@SGGUID+16, 18421, 1, 1, 0), (@SGGUID+16, 19486, 1, 1, 0), -- Sunseeker Researcher, Sunseeker Chemist
@@ -776,7 +759,29 @@ INSERT INTO `spawn_group_spawn` (`Id`, `Guid`, `SlotId`, `Chance`) VALUES
 (@SGGUID+38, @CGUID+139, 3, 0), -- Mutate Fear-Shrieker
 
 (@SGGUID+39, @CGUID+26, 0, 0), -- Bloodwarder Protector - left
-(@SGGUID+39, @CGUID+27, 1, 0); -- Bloodwarder Protector - right
+(@SGGUID+39, @CGUID+27, 1, 0), -- Bloodwarder Protector - right
+
+(@SGGUID+40, @CGUID+157, 0, 0), -- Frayer Wildling
+(@SGGUID+40, @CGUID+158, 1, 0), -- Frayer Wildling
+(@SGGUID+40, @CGUID+159, 2, 0), -- Frayer Wildling
+(@SGGUID+40, @CGUID+160, 3, 0), -- Frayer Wildling
+(@SGGUID+40, @CGUID+161, 4, 0), -- Frayer Wildling
+(@SGGUID+40, @CGUID+162, 5, 0), -- Frayer Wildling
+(@SGGUID+40, @CGUID+163, 6, 0), -- Frayer Wildling
+(@SGGUID+40, @CGUID+164, 7, 0), -- Frayer Wildling
+(@SGGUID+40, @CGUID+165, 8, 0), -- Frayer Wildling
+(@SGGUID+40, @CGUID+166, 9, 0), -- Frayer Wildling
+
+(@SGGUID+41, @CGUID+167, 0, 0), -- Frayer Wildling
+(@SGGUID+41, @CGUID+168, 1, 0), -- Frayer Wildling
+(@SGGUID+41, @CGUID+169, 2, 0), -- Frayer Wildling
+(@SGGUID+41, @CGUID+170, 3, 0), -- Frayer Wildling
+(@SGGUID+41, @CGUID+171, 4, 0), -- Frayer Wildling
+(@SGGUID+41, @CGUID+172, 5, 0), -- Frayer Wildling
+(@SGGUID+41, @CGUID+173, 6, 0), -- Frayer Wildling
+(@SGGUID+41, @CGUID+174, 7, 0), -- Frayer Wildling
+(@SGGUID+41, @CGUID+175, 8, 0), -- Frayer Wildling
+(@SGGUID+41, @CGUID+176, 9, 0); -- Frayer Wildling
 
 INSERT INTO `spawn_group_formation` (`Id`, `FormationType`, `FormationSpread`, `FormationOptions`, `PathId`, `MovementType`, `Comment`) VALUES
 (@SGGUID+20, 1, 3, 0, @SGGUID+20, 2, 'The Botanica - Group 020 - Sunseeker Botanist - Greater Frayer | Patrol 01'),