diff --git a/CHANGELOG.md b/CHANGELOG.md
index b638b666..d8a3d7a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 - Haste
     - Cooldown reduced to 1T (was 2T)
+    - Duration increased from 2/3/4T -> 3/4/5T
 
 - Sleep
     - Cooldown reduced to 2T (was 3T)
@@ -48,6 +49,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 - Hybrid
     - Cooldown reduced to 1T (was 3T)
+    - Duration increased from 2/3/4T -> 3/4/5T
 
 - Silence
     - Cooldown reduced to 2T (was 3T)
diff --git a/server/src/skill.rs b/server/src/skill.rs
index 6cbb383e..340b7185 100644
--- a/server/src/skill.rs
+++ b/server/src/skill.rs
@@ -815,6 +815,9 @@ impl Skill {
             Skill::BashPlus => 65,
             Skill::BashPlusPlus => 100,
 
+            Skill::Link=> 75,
+            Skill::LinkPlus => 100,
+            Skill::LinkPlusPlus => 150,
             // Debuff Base
             Skill::DecayTick=> 33,
             Skill::DecayTickPlus => 45,
@@ -828,13 +831,13 @@ impl Skill {
 
             // Buff base
             Skill::HybridBlast => 25,
+            
             Skill::HasteStrike => 30,
-            Skill::Link=> 75,
-            Skill::LinkPlus => 100,
-            Skill::LinkPlusPlus => 150,
+            
             Skill::Intercept=> 80,
             Skill::InterceptPlus => 110,
             Skill::InterceptPlusPlus => 150,
+            
             Skill::TriageTick=> 75,
             Skill::TriageTickPlus => 110,
             Skill::TriageTickPlusPlus => 140,
@@ -901,11 +904,11 @@ impl Skill {
                                         ConstructEffect {effect: Effect::Decay, duration: 4,
                                             meta: Some(EffectMeta::Skill(Skill::DecayTickPlusPlus)), tick: None}],
 
-            Skill::Haste         => vec![ConstructEffect {effect: Effect::Haste, duration: 2,
+            Skill::Haste         => vec![ConstructEffect {effect: Effect::Haste, duration: 3,
                                             meta: Some(EffectMeta::Multiplier(150)), tick: None }],
-            Skill::HastePlus     => vec![ConstructEffect {effect: Effect::Haste, duration: 3,
+            Skill::HastePlus     => vec![ConstructEffect {effect: Effect::Haste, duration: 4,
                                             meta: Some(EffectMeta::Multiplier(175)), tick: None }],
-            Skill::HastePlusPlus => vec![ConstructEffect {effect: Effect::Haste, duration: 4,
+            Skill::HastePlusPlus => vec![ConstructEffect {effect: Effect::Haste, duration: 5,
                                             meta: Some(EffectMeta::Multiplier(225)), tick: None }],
 
             Skill::Absorb   => vec![ConstructEffect {effect: Effect::Absorb, duration: 2,
@@ -919,11 +922,11 @@ impl Skill {
             Skill::AbsorptionPlus     => vec![ConstructEffect {effect: Effect::Absorption, duration: 5, meta: None, tick: None}],
             Skill::AbsorptionPlusPlus => vec![ConstructEffect {effect: Effect::Absorption, duration: 7, meta: None, tick: None}],
 
-            Skill::Hybrid         => vec![ConstructEffect {effect: Effect::Hybrid, duration: 2,
+            Skill::Hybrid         => vec![ConstructEffect {effect: Effect::Hybrid, duration: 3,
                                             meta: Some(EffectMeta::Multiplier(150)), tick: None }],
-            Skill::HybridPlus     => vec![ConstructEffect {effect: Effect::Hybrid, duration: 3,
+            Skill::HybridPlus     => vec![ConstructEffect {effect: Effect::Hybrid, duration: 4,
                                             meta: Some(EffectMeta::Multiplier(175)), tick: None }],
-            Skill::HybridPlusPlus => vec![ConstructEffect {effect: Effect::Hybrid, duration: 4,
+            Skill::HybridPlusPlus => vec![ConstructEffect {effect: Effect::Hybrid, duration: 5,
                                             meta: Some(EffectMeta::Multiplier(225)), tick: None }],
 
             Skill::Invert         => vec![ConstructEffect {effect: Effect::Invert, duration: 2, meta: None, tick: None}],