diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html
index 88cab35c0a..4e52473afe 100644
--- a/Shadowrun5th/Shadowrun5th.html
+++ b/Shadowrun5th/Shadowrun5th.html
@@ -10310,65 +10310,65 @@ on("sheet:opened", function() {
         if(keys.includes('armorname1') && values.armorname1 !== null) {
             var newrowid=generateRowID()
             attributes["repeating_armors_"+newrowid+"_armorname"]=values.armorname1;
-            attributes["repeating_armors_"+newrowid+"_armorrating"]=values.armorrating1;
-            attributes["repeating_armors_"+newrowid+"_armornotes"]=values.armornotes1;
-            attributes["repeating_armors_"+newrowid+"_armorcapacity"]=values.armorcapacity1;
+            attributes["repeating_armors_"+newrowid+"_armorrating"]=!!values.armorrating7 ? values.armorrating7 : "0";
+            attributes["repeating_armors_"+newrowid+"_armornotes"]=!!values.armornotes7 ? values.armornotes7 : "";
+            attributes["repeating_armors_"+newrowid+"_armorcapacity"]=!!values.armorcapacity7 ? values.armorcapacity7 : "0";
         }
 
         if(keys.includes('armorname2') && values.armorname2 !== null) {
             var newrowid=generateRowID()
             attributes["repeating_armors_"+newrowid+"_armorname"]=values.armorname2;
-            attributes["repeating_armors_"+newrowid+"_armorrating"]=values.armorrating2;
-            attributes["repeating_armors_"+newrowid+"_armornotes"]=values.armornotes2;
-            attributes["repeating_armors_"+newrowid+"_armorcapacity"]=values.armorcapacity2;
+            attributes["repeating_armors_"+newrowid+"_armorrating"]=!!values.armorrating7 ? values.armorrating7 : "0";
+            attributes["repeating_armors_"+newrowid+"_armornotes"]=!!values.armornotes7 ? values.armornotes7 : "";
+            attributes["repeating_armors_"+newrowid+"_armorcapacity"]=!!values.armorcapacity7 ? values.armorcapacity7 : "0";
         }
 
         if(keys.includes('armorname3') && values.armorname3 !== null) {
             var newrowid=generateRowID()
             attributes["repeating_armors_"+newrowid+"_armorname"]=values.armorname3;
-            attributes["repeating_armors_"+newrowid+"_armorrating"]=values.armorrating3;
-            attributes["repeating_armors_"+newrowid+"_armornotes"]=values.armornotes3;
-            attributes["repeating_armors_"+newrowid+"_armorcapacity"]=values.armorcapacity3;
+            attributes["repeating_armors_"+newrowid+"_armorrating"]=!!values.armorrating7 ? values.armorrating7 : "0";
+            attributes["repeating_armors_"+newrowid+"_armornotes"]=!!values.armornotes7 ? values.armornotes7 : "";
+            attributes["repeating_armors_"+newrowid+"_armorcapacity"]=!!values.armorcapacity7 ? values.armorcapacity7 : "0";
         }
 
         if(keys.includes('armorname4') && values.armorname4 !== null) {
             var newrowid=generateRowID()
             attributes["repeating_armors_"+newrowid+"_armorname"]=values.armorname4;
-            attributes["repeating_armors_"+newrowid+"_armorrating"]=values.armorrating4;
-            attributes["repeating_armors_"+newrowid+"_armornotes"]=values.armornotes4;
-            attributes["repeating_armors_"+newrowid+"_armorcapacity"]=values.armorcapacity4;
+            attributes["repeating_armors_"+newrowid+"_armorrating"]=!!values.armorrating7 ? values.armorrating7 : "0";
+            attributes["repeating_armors_"+newrowid+"_armornotes"]=!!values.armornotes7 ? values.armornotes7 : "";
+            attributes["repeating_armors_"+newrowid+"_armorcapacity"]=!!values.armorcapacity7 ? values.armorcapacity7 : "0";
         }
 
         if(keys.includes('armorname5') && values.armorname5 !== null) {
             var newrowid=generateRowID()
             attributes["repeating_armors_"+newrowid+"_armorname"]=values.armorname5;
-            attributes["repeating_armors_"+newrowid+"_armorrating"]=values.armorrating5;
-            attributes["repeating_armors_"+newrowid+"_armornotes"]=values.armornotes5;
-            attributes["repeating_armors_"+newrowid+"_armorcapacity"]=values.armorcapacity5;
+            attributes["repeating_armors_"+newrowid+"_armorrating"]=!!values.armorrating7 ? values.armorrating7 : "0";
+            attributes["repeating_armors_"+newrowid+"_armornotes"]=!!values.armornotes7 ? values.armornotes7 : "";
+            attributes["repeating_armors_"+newrowid+"_armorcapacity"]=!!values.armorcapacity7 ? values.armorcapacity7 : "0";
         }
 
         if(keys.includes('armorname6') && values.armorname6 !== null) {
             var newrowid=generateRowID()
             attributes["repeating_armors_"+newrowid+"_armorname"]=values.armorname6;
-            attributes["repeating_armors_"+newrowid+"_armorrating"]=values.armorrating6;
-            attributes["repeating_armors_"+newrowid+"_armornotes"]=values.armornotes6;
-            attributes["repeating_armors_"+newrowid+"_armorcapacity"]=values.armorcapacity6;
+            attributes["repeating_armors_"+newrowid+"_armorrating"]=!!values.armorrating7 ? values.armorrating7 : "0";
+            attributes["repeating_armors_"+newrowid+"_armornotes"]=!!values.armornotes7 ? values.armornotes7 : "";
+            attributes["repeating_armors_"+newrowid+"_armorcapacity"]=!!values.armorcapacity7 ? values.armorcapacity7 : "0";
         }
 
         if(keys.includes('armorname7') && values.armorname7 !== null) {
             var newrowid=generateRowID()
             attributes["repeating_armors_"+newrowid+"_armorname"]=values.armorname7;
-            attributes["repeating_armors_"+newrowid+"_armorrating"]=values.armorrating7;
-            attributes["repeating_armors_"+newrowid+"_armornotes"]=values.armornotes7;
-            attributes["repeating_armors_"+newrowid+"_armorcapacity"]=values.armorcapacity7;
+            attributes["repeating_armors_"+newrowid+"_armorrating"]=!!values.armorrating7 ? values.armorrating7 : "0";
+            attributes["repeating_armors_"+newrowid+"_armornotes"]=!!values.armornotes7 ? values.armornotes7 : "";
+            attributes["repeating_armors_"+newrowid+"_armorcapacity"]=!!values.armorcapacity7 ? values.armorcapacity7 : "0";
         }
 
         if(keys.includes('armorname8') && values.armorname8 !== null) {
             var newrowid=generateRowID()
             attributes["repeating_armors_"+newrowid+"_armorname"]=values.armorname8;
-            attributes["repeating_armors_"+newrowid+"_armorrating"]=values.armorrating8;
-            attributes["repeating_armors_"+newrowid+"_armornotes"]=values.armornotes8;
-            attributes["repeating_armors_"+newrowid+"_armorcapacity"]=values.armorcapacity8;
+            attributes["repeating_armors_"+newrowid+"_armorrating"]=!!values.armorrating8 ? values.armorrating8 : "0";
+            attributes["repeating_armors_"+newrowid+"_armornotes"]=!!values.armornotes8 ? values.armornotes8 : "";
+            attributes["repeating_armors_"+newrowid+"_armorcapacity"]=!!values.armorcapacity8 ? values.armorcapacity8 : "0";
         }
         attributes["armormigration042021"] = true;
         setAttrs(attributes);