diff --git a/eos/effects/modulebonusnetworkedsensorarray.py b/eos/effects/modulebonusnetworkedsensorarray.py
index 880e041bb..53502bed7 100644
--- a/eos/effects/modulebonusnetworkedsensorarray.py
+++ b/eos/effects/modulebonusnetworkedsensorarray.py
@@ -4,9 +4,8 @@
 # Module: Networked Sensor Array
 type = "active"
 def handler(fit, src, context):
-    fit.ship.increaseItemAttr("maxLockedTargets", src.getModifiedItemAttr("maxLockedTargetsBonus"))
     fit.ship.multiplyItemAttr("maxTargetRange", src.getModifiedItemAttr("maxTargetRangeMultiplier"), stackingPenalties=True, penaltyGroup="postMul")
-    fit.ship.multiplyItemAttr("scanResolution", src.getModifiedItemAttr("scanResolutionMultiplier"), stackingPenalties=True)
+    fit.ship.boostItemAttr("scanResolution", src.getModifiedItemAttr("scanResolutionBonus"), stackingPenalties=True)
 
     for scanType in ('Magnetometric', 'Ladar', 'Gravimetric', 'Radar'):
         fit.ship.boostItemAttr("scan{}Strength".format(scanType),
diff --git a/eos/effects/modulebonussiegemodule.py b/eos/effects/modulebonussiegemodule.py
index b51553ff7..93890033e 100644
--- a/eos/effects/modulebonussiegemodule.py
+++ b/eos/effects/modulebonussiegemodule.py
@@ -44,11 +44,6 @@ def handler(fit, src, context):
     fit.ship.forceItemAttr("disallowAssistance", src.getModifiedItemAttr("disallowAssistance"))
 
     # new in April 2016 release
-    for scanType in ('Magnetometric', 'Ladar', 'Gravimetric', 'Radar'):
-        fit.ship.boostItemAttr("scan{}Strength".format(scanType),
-                               src.getModifiedItemAttr("scan{}StrengthPercent".format(scanType)),
-                               stackingPenalties=True)
-
     # missile ROF bonus
     for group in ("Missile Launcher XL Torpedo", "Missile Launcher Rapid Torpedo", "Missile Launcher XL Cruise"):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == group, "speed", src.getModifiedItemAttr("siegeLauncherROFBonus"), stackingPenalties=True)
diff --git a/eos/effects/modulebonustriagemodule.py b/eos/effects/modulebonustriagemodule.py
index 791acecc3..30384fdb2 100644
--- a/eos/effects/modulebonustriagemodule.py
+++ b/eos/effects/modulebonustriagemodule.py
@@ -56,12 +56,6 @@ def handler(fit, src, context):
     fit.ship.forceItemAttr("disallowAssistance", src.getModifiedItemAttr("disallowAssistance"))
 
     # new in April 2016 release
-
-    for scanType in ('Magnetometric', 'Ladar', 'Gravimetric', 'Radar'):
-        fit.ship.boostItemAttr("scan{}Strength".format(scanType),
-                               src.getModifiedItemAttr("scan{}StrengthPercent".format(scanType)),
-                               stackingPenalties=True)
-
     fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier", src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
 
     fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("siegeModeWarpStatus"))
diff --git a/eos/effects/rigdrawbackreductionarmor.py b/eos/effects/rigdrawbackreductionarmor.py
new file mode 100644
index 000000000..f76ff2497
--- /dev/null
+++ b/eos/effects/rigdrawbackreductionarmor.py
@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Armor", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Resource Processing", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/rigdrawbackreductionastronautics.py b/eos/effects/rigdrawbackreductionastronautics.py
new file mode 100644
index 000000000..9f235f846
--- /dev/null
+++ b/eos/effects/rigdrawbackreductionastronautics.py
@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Navigation", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Anchor", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/rigdrawbackreductiondrones.py b/eos/effects/rigdrawbackreductiondrones.py
new file mode 100644
index 000000000..8935bf594
--- /dev/null
+++ b/eos/effects/rigdrawbackreductiondrones.py
@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Drones", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/rigdrawbackreductionelectronic.py b/eos/effects/rigdrawbackreductionelectronic.py
new file mode 100644
index 000000000..db8267332
--- /dev/null
+++ b/eos/effects/rigdrawbackreductionelectronic.py
@@ -0,0 +1,6 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Electronic Systems", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Scanning", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Targeting", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/rigdrawbackreductionenergyweapon.py b/eos/effects/rigdrawbackreductionenergyweapon.py
new file mode 100644
index 000000000..35e70b2ab
--- /dev/null
+++ b/eos/effects/rigdrawbackreductionenergyweapon.py
@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Energy Weapon", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/rigdrawbackreductionhybrid.py b/eos/effects/rigdrawbackreductionhybrid.py
new file mode 100644
index 000000000..8e4e54e48
--- /dev/null
+++ b/eos/effects/rigdrawbackreductionhybrid.py
@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Hybrid Weapon", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/rigdrawbackreductionlauncher.py b/eos/effects/rigdrawbackreductionlauncher.py
new file mode 100644
index 000000000..9afeb7ac3
--- /dev/null
+++ b/eos/effects/rigdrawbackreductionlauncher.py
@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Launcher", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/rigdrawbackreductionprojectile.py b/eos/effects/rigdrawbackreductionprojectile.py
new file mode 100644
index 000000000..423f22936
--- /dev/null
+++ b/eos/effects/rigdrawbackreductionprojectile.py
@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Projectile Weapon", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/rigdrawbackreductionshield.py b/eos/effects/rigdrawbackreductionshield.py
new file mode 100644
index 000000000..701fbf848
--- /dev/null
+++ b/eos/effects/rigdrawbackreductionshield.py
@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Shield", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/graph/fitDps.py b/eos/graph/fitDps.py
index dc402706d..7bdc68ca0 100644
--- a/eos/graph/fitDps.py
+++ b/eos/graph/fitDps.py
@@ -95,11 +95,10 @@ class FitDpsGraph(Graph):
         targetSigRad = explosionRadius if targetSigRad is None else targetSigRad
         explosionVelocity = mod.getModifiedChargeAttr("aoeVelocity")
         damageReductionFactor = mod.getModifiedChargeAttr("aoeDamageReductionFactor")
-        damageReductionSensitivity = mod.getModifiedChargeAttr("aoeDamageReductionSensitivity")
 
         sigRadiusFactor = targetSigRad / explosionRadius
         if targetVelocity:
-            velocityFactor = (explosionVelocity / explosionRadius * targetSigRad / targetVelocity) ** (log(damageReductionFactor) / log(damageReductionSensitivity))
+            velocityFactor = (explosionVelocity / explosionRadius * targetSigRad / targetVelocity) ** damageReductionFactor
         else:
             velocityFactor = 1
 
diff --git a/eve.db b/eve.db
index 25a40b791..bbc81127d 100644
Binary files a/eve.db and b/eve.db differ