diff --git a/eos/effects/commandbonusecmmultiplywithcommandbonushidden.py b/eos/effects/commandbonusecmmultiplywithcommandbonushidden.py
index e133132a4..5272b000f 100755
--- a/eos/effects/commandbonusecmmultiplywithcommandbonushidden.py
+++ b/eos/effects/commandbonusecmmultiplywithcommandbonushidden.py
@@ -6,7 +6,7 @@ type = "active", "gang"
 def handler(fit, module, context):
     if "gang" not in context: return
     for scanType in ("Magnetometric", "Radar", "Ladar", "Gravimetric"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Electronic Warfare"),
                                       "scan%sStrengthBonus" % scanType,
                                       module.getModifiedItemAttr("commandBonusECM"),
                                       stackingPenalties = True)
diff --git a/eos/effects/commandbonusrsdmultiplywithcommandbonushidden.py b/eos/effects/commandbonusrsdmultiplywithcommandbonushidden.py
index d58a2abeb..256dc1306 100755
--- a/eos/effects/commandbonusrsdmultiplywithcommandbonushidden.py
+++ b/eos/effects/commandbonusrsdmultiplywithcommandbonushidden.py
@@ -5,8 +5,8 @@ gangBoost = "ewarStrRSD"
 type = "active", "gang"
 def handler(fit, module, context):
     if "gang" not in context: return
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Sensor Damper",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Sensor Linking"),
                                   "maxTargetRangeBonus", module.getModifiedItemAttr("commandBonusRSD"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Sensor Damper",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Sensor Linking"),
                                   "scanResolutionBonus", module.getModifiedItemAttr("commandBonusRSD"),
                                   stackingPenalties=True)
diff --git a/eos/effects/gasharvestingcycletimemodulesrequiringgascloudharvesting.py b/eos/effects/gasharvestingcycletimemodulesrequiringgascloudharvesting.py
index 1366c1aab..c5a4dc939 100755
--- a/eos/effects/gasharvestingcycletimemodulesrequiringgascloudharvesting.py
+++ b/eos/effects/gasharvestingcycletimemodulesrequiringgascloudharvesting.py
@@ -3,4 +3,4 @@
 type = "passive"
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gas Cloud Harvesting"),
-                                  "duration", implant.getModifiedItemAttr("durationBonus"))
\ No newline at end of file
+                                  "duration", implant.getModifiedItemAttr("durationBonus"))
diff --git a/eos/effects/heatdamagebonus.py b/eos/effects/heatdamagebonus.py
new file mode 100644
index 000000000..127bc51c1
--- /dev/null
+++ b/eos/effects/heatdamagebonus.py
@@ -0,0 +1,6 @@
+# Used by:
+# Modules from group: Shield Boost Amplifier (25 of 25)
+type = "passive"
+def handler(fit, module, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
+                                  "heatDamage", module.getModifiedItemAttr("heatDamageBonus"))