diff --git a/scripts/DreamsRotations - Rogue Assassination PvE (WOTLK).lua b/scripts/DreamsRotations - Rogue Assassination PvE (WOTLK).lua
index 813da18..78209a8 100644
--- a/scripts/DreamsRotations - Rogue Assassination PvE (WOTLK).lua	
+++ b/scripts/DreamsRotations - Rogue Assassination PvE (WOTLK).lua	
@@ -49,7 +49,7 @@ local PotionOfSpeed = Bastion.ItemBook:GetItem(40211)
 local PreCombatAPL = Bastion.APL:New('precombat')
 local DefaultAPL = Bastion.APL:New('default')
 
--- actions.precombat+=/tricks_of_the_trade
+-- actions.precombat+=/tricks_of_the_trade,if=group
 PreCombatAPL:AddSpell(
     TricksOfTheTrade:CastableIf(function(self)
         return Focus:Exists() and self:IsInRange(Focus) and self:IsKnownAndUsable() and Focus:IsAffectingCombat()
@@ -101,28 +101,28 @@ DefaultAPL:AddSpell(
 -- actions+=/vanish,if=talent.overkill.enabled&buff.overkill.down
 DefaultAPL:AddSpell(
     Vanish:CastableIf(function(self)
-        return Target:Exists() and self:IsKnownAndUsable() and self:IsInRange(Target) and not Player:GetAuras():FindMy(Overkill):IsUp()
+        return Target:Exists() and self:IsKnownAndUsable() and self:IsInRange(Target) and Target:IsBoss() and not Player:GetAuras():FindMy(Overkill):IsUp()
     end):SetTarget(Target)
 )
 
--- actions+=/envenom,if=combo_points.deficit=0&buff.cold_blood.up
+-- actions+=/tricks_of_the_trade,if=group
 DefaultAPL:AddSpell(
-    Envenom:CastableIf(function(self)
-        return Target:Exists() and self:IsKnownAndUsable() and self:IsInRange(Target) and Player:GetComboPointsDeficit(Target) < 1 and Player:GetAuras():FindMy(ColdBlood):IsUp()
-    end):SetTarget(Target)
+    TricksOfTheTrade:CastableIf(function(self)
+        return Focus:Exists() and self:IsInRange(Focus) and self:IsKnownAndUsable() and Focus:IsAffectingCombat()
+    end):SetTarget(Focus)
 )
 
 -- actions+=/cold_blood,if=combo_points.deficit=0
 DefaultAPL:AddSpell(
     ColdBlood:CastableIf(function(self)
-        return Target:Exists() and self:IsKnownAndUsable() and self:IsInRange(Target) and Player:GetComboPointsDeficit(Target) < 1 and Target:IsBoss()
+        return Target:Exists() and self:IsKnownAndUsable() and self:IsInRange(Target) and Target:IsBoss() and Player:GetComboPointsDeficit(Target) < 2 and not Player:GetAuras():FindMy(Envenom):IsUp()
     end):SetTarget(Target)
 )
 
 -- actions+=/envenom,if=combo_points.deficit<2&(debuff.envenom.down|energy.time_to_max<debuff.envenom.remains)
 DefaultAPL:AddSpell(
     Envenom:CastableIf(function(self)
-        return Target:Exists() and self:IsKnownAndUsable() and self:IsInRange(Target) and Player:GetComboPointsDeficit(Target) < 2 and not Player:GetAuras():FindMy(Envenom):IsUp() and Player:GetPowerDeficit() < 30
+        return Target:Exists() and self:IsKnownAndUsable() and self:IsInRange(Target) and Player:GetComboPointsDeficit(Target) < 2 and not Player:GetAuras():FindMy(Envenom):IsUp() and Player:GetPowerDeficit() < 35
     end):SetTarget(Target)
 )
 
@@ -139,6 +139,9 @@ AssassinationModule:Sync(function()
     end
     if Player:IsAffectingCombat() then
         DefaultAPL:Execute()
+        if not IsPlayerAttacking('target') then
+            Eval('StartAttack()', 't')
+        end
     end
 
     Draw:Enable()