diff --git a/eos/effects/adaptivearmorhardener.py b/eos/effects/adaptivearmorhardener.py
index 323bbdeac..e06d1a9c9 100644
--- a/eos/effects/adaptivearmorhardener.py
+++ b/eos/effects/adaptivearmorhardener.py
@@ -13,8 +13,8 @@ def handler(fit, module, context):
 
     # Skip if there is no damage pattern. Example: projected ships or fleet boosters
     if damagePattern:
-        logger.debug("Damage Pattern: %f/%f/%f/%f", damagePattern.emAmount, damagePattern.thermalAmount, damagePattern.kineticAmount, damagePattern.explosiveAmount)
-        logger.debug("Original Armor Resists: %f/%f/%f/%f", fit.ship.getModifiedItemAttr('armorEmDamageResonance'), fit.ship.getModifiedItemAttr('armorThermalDamageResonance'), fit.ship.getModifiedItemAttr('armorKineticDamageResonance'), fit.ship.getModifiedItemAttr('armorExplosiveDamageResonance'))
+        #logger.debug("Damage Pattern: %f/%f/%f/%f", damagePattern.emAmount, damagePattern.thermalAmount, damagePattern.kineticAmount, damagePattern.explosiveAmount)
+        #logger.debug("Original Armor Resists: %f/%f/%f/%f", fit.ship.getModifiedItemAttr('armorEmDamageResonance'), fit.ship.getModifiedItemAttr('armorThermalDamageResonance'), fit.ship.getModifiedItemAttr('armorKineticDamageResonance'), fit.ship.getModifiedItemAttr('armorExplosiveDamageResonance'))
 
         # Populate a tuple with the damage profile modified by current armor resists.
         baseDamageTaken = (
@@ -23,24 +23,22 @@ def handler(fit, module, context):
             damagePattern.kineticAmount * fit.ship.getModifiedItemAttr('armorKineticDamageResonance'),
             damagePattern.explosiveAmount * fit.ship.getModifiedItemAttr('armorExplosiveDamageResonance'),
         )
-        logger.debug("Damage Adjusted for Armor Resists: %f/%f/%f/%f", baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3])
+        #logger.debug("Damage Adjusted for Armor Resists: %f/%f/%f/%f", baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3])
 
         resistanceShiftAmount = module.getModifiedItemAttr('resistanceShiftAmount') / 100 # The attribute is in percent and we want a fraction
         RAHResistance = [
-            module.itemModifiedAttributes.getOriginal('armorEmDamageResonance'), 
-            module.itemModifiedAttributes.getOriginal('armorThermalDamageResonance'), 
-            module.itemModifiedAttributes.getOriginal('armorKineticDamageResonance'), 
-            module.itemModifiedAttributes.getOriginal('armorExplosiveDamageResonance'),
+            module.getModifiedItemAttr('armorEmDamageResonance'), 
+            module.getModifiedItemAttr('armorThermalDamageResonance'), 
+            module.getModifiedItemAttr('armorKineticDamageResonance'), 
+            module.getModifiedItemAttr('armorExplosiveDamageResonance'),
         ]
         
         # Simulate RAH cycles until the RAH either stops changing or enters a loop.
         # The number of iterations is limited to prevent an infinite loop if something goes wrong.
         cycleList = []
         loopStart = -1
-        for num in range(1, 51):
-            cycleList.append(list(RAHResistance))
-            
-            logger.debug("Starting cycle %d.")
+        for num in range(50):
+            #logger.debug("Starting cycle %d.", num)
             # The strange order is to emulate the ingame sorting when different types have taken the same amount of damage.
             damagePattern_tuples = [
                 (0, baseDamageTaken[0] * RAHResistance[0], RAHResistance[0]),
@@ -48,7 +46,7 @@ def handler(fit, module, context):
                 (2, baseDamageTaken[2] * RAHResistance[2], RAHResistance[2]),
                 (1, baseDamageTaken[1] * RAHResistance[1], RAHResistance[1]),
             ]
-            logger.debug("Damage taken this cycle: %f/%f/%f/%f", damagePattern_tuples[0][1], damagePattern_tuples[3][1], damagePattern_tuples[2][1], damagePattern_tuples[1][1])
+            #logger.debug("Damage taken this cycle: %f/%f/%f/%f", damagePattern_tuples[0][1], damagePattern_tuples[3][1], damagePattern_tuples[2][1], damagePattern_tuples[1][1])
                 
             # Sort the tuple to drop the highest damage value to the bottom
             sortedDamagePattern_tuples = sorted(damagePattern_tuples, key=lambda damagePattern: damagePattern[1])
@@ -70,27 +68,33 @@ def handler(fit, module, context):
             RAHResistance[sortedDamagePattern_tuples[1][0]] = sortedDamagePattern_tuples[1][2] + change1
             RAHResistance[sortedDamagePattern_tuples[2][0]] = sortedDamagePattern_tuples[2][2] + change2
             RAHResistance[sortedDamagePattern_tuples[3][0]] = sortedDamagePattern_tuples[3][2] + change3
-            logger.debug("Resistances shifted to %f/%f/%f/%f", RAHResistance[0], RAHResistance[1], RAHResistance[2], RAHResistance[3])
+            #logger.debug("Resistances shifted to %f/%f/%f/%f", RAHResistance[0], RAHResistance[1], RAHResistance[2], RAHResistance[3])
             
             # See if the current RAH profile has been encountered before, indicating a loop.
             for i, val in enumerate(cycleList):
                 tolerance = 1e-09 
                 if abs(RAHResistance[0] - val[0]) <= tolerance and abs(RAHResistance[1] - val[1]) <= tolerance and abs(RAHResistance[2] - val[2]) <= tolerance and abs(RAHResistance[3] - val[3]) <= tolerance:
                     loopStart = i
-                    logger.debug("Loop found: %d-%d", loopStart, num)
+                    #logger.debug("Loop found: %d-%d", loopStart + 1, num)
                     break
                 if loopStart >= 0: break
             if loopStart >= 0: break
+            
+            cycleList.append(list(RAHResistance))
+            
+        if loopStart < 0:
+            logger.error("Reactive Armor Hardener failed to find equalibrium. Damage profile after armor: %f/%f/%f/%f", baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3])
         
         # Average the RAH profiles that it loops through
         loopCycles = cycleList[loopStart:]
+		numCycles = len(loopCycles)
         average = [0, 0, 0, 0]
         for cycle in loopCycles:
             for i in range(4):
-                average[i] += cycle[i] / len(loopCycles)
+                average[i] += cycle[i] / numCycles
             
         # Set the new resistances
-        logger.debug("Setting new resist profile: %f/%f/%f/%f", average[0], average[1], average[2],average[3])
+        #logger.debug("Setting new resist profile: %f/%f/%f/%f", average[0], average[1], average[2],average[3])
         for i, damagePatternType in enumerate(('Em', 'Thermal', 'Kinetic', 'Explosive')):
             attr = "armor%sDamageResonance" % damagePatternType
             module.forceItemAttr(attr, average[i])