diff --git a/HeroSystem6eHeroic/HeroSystem6eHeroic.html b/HeroSystem6eHeroic/HeroSystem6eHeroic.html
index d389f9ce92..1336c67029 100644
--- a/HeroSystem6eHeroic/HeroSystem6eHeroic.html
+++ b/HeroSystem6eHeroic/HeroSystem6eHeroic.html
@@ -16375,7 +16375,7 @@
 			
 			<div class="item-version-information">
 				<!-- Update version before release. -->
-				<input type="text" value="4.70" name="attr_version" title="@{version}" readonly tabindex="-1"/>
+				<input type="text" value="4.71" name="attr_version" title="@{version}" readonly tabindex="-1"/>
 			</div>
 		</div>
 		
@@ -19744,22 +19744,22 @@
 				if (isAttack) {
 					if (isMental) {
 						if (dispDoS) {
-							theRoll	+= "{{Hit DMCV=[[11-3d6cf6cs1+@{omcv}[OMCV]+?{OMCV Modifier|0}[Modifiers]]]"+(isAoE ? " (AoE)}}" : "}}");
+							theRoll	+= "{{Hit DMCV=[[11-3d6cf6cs1+@{omcvNet}[OMCV]+?{OMCV Modifier|0}[Modifiers]]]"+(isAoE ? " (AoE)}}" : "}}");
 						} else {
-							theRoll	+= "{{OMCV=[[@{omcv}[OMCV]+?{OMCV Modifier|0}[Modifiers]]]}}+{{Result=[[3d6cf6cs1]]"+(isAoE ? " (AoE)}}" : "}}");
+							theRoll	+= "{{OMCV=[[@{omcvNet}[OMCV]+?{OMCV Modifier|0}[Modifiers]]]}}+{{Result=[[3d6cf6cs1]]"+(isAoE ? " (AoE)}}" : "}}");
 						}
 					} else if (isRanged && hasRangePenalty) {
 						// Keeping Mental CV functionality here if future cases come up where it becomes needed.
 						if (dispDoS) {
-							theRoll	+= "{{Hit "+ (isMental ? "DMCV" : "DCV") + "=[[11-3d6cf6cs1" + (isMental ? "+@{omcv}[OMCV]"  : "+@{ocv}[OCV]") + (isSet ? "+1[Set]" :"") + "-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]-" + theRangePenalty + "[RangeOCV]" + (isBraced ? "+"+braceMod+"[Braced]" :"") +  "+?{" + (isMental ? "MOCV" : "OCV") + " Modifier|0}[Modifiers]]]"+(isAoE ? " (AoE)}}" : "}}");
+							theRoll	+= "{{Hit "+ (isMental ? "DMCV" : "DCV") + "=[[11-3d6cf6cs1" + (isMental ? "+@{omcvNet}[OMCV]"  : "+@{ocv}[OCV]") + (isSet ? "+1[Set]" :"") + "-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]-" + theRangePenalty + "[RangeOCV]" + (isBraced ? "+"+braceMod+"[Braced]" :"") +  "+?{" + (isMental ? "MOCV" : "OCV") + " Modifier|0}[Modifiers]]]"+(isAoE ? " (AoE)}}" : "}}");
 						} else {
-							theRoll	+= "{{" + (isMental ? "OMCV=[[@{omcv}[OMCV]"  : "OCV=[[@{ocv}[OCV]") + (isSet ? "+1[Set]" :"") + "-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]-" + theRangePenalty + "[RangeOCV]" + (isBraced ? "+"+braceMod+"[Braced]" :"") +  "+?{" + (isMental ? "MOCV" : "OCV") + " Modifier|0}[Modifiers]]]}}"+"{{Result=[[3d6cf6cs1]]"+(isAoE ? " (AoE)}}" : "}}");
+							theRoll	+= "{{" + (isMental ? "OMCV=[[@{omcvNet}[OMCV]"  : "OCV=[[@{ocvNet}[OCV]") + (isSet ? "+1[Set]" :"") + "-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]-" + theRangePenalty + "[RangeOCV]" + (isBraced ? "+"+braceMod+"[Braced]" :"") +  "+?{" + (isMental ? "MOCV" : "OCV") + " Modifier|0}[Modifiers]]]}}"+"{{Result=[[3d6cf6cs1]]"+(isAoE ? " (AoE)}}" : "}}");
 						}
 					} else {
 						if (dispDoS) {
-							theRoll	+= "{{Hit "+ (isMental ? "DMCV" : "DCV") + "=[[11-3d6cf6cs1" + (isMental ? "+@{omcv}[OMCV]"  : "+@{ocv}[OCV]") + (isSet ? "+1[Set]" :"") + "-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]" + (isRanged ? "-0[NetRangePenalty]" :"") + "+?{" + (isMental ? "MOCV" : "OCV") + " Modifier|0}[Modifiers]]]"+(isAoE ? " (AoE)}}" : "}}");
+							theRoll	+= "{{Hit "+ (isMental ? "DMCV" : "DCV") + "=[[11-3d6cf6cs1" + (isMental ? "+@{omcvNet}[OMCV]"  : "+@{ocvNet}[OCV]") + (isSet ? "+1[Set]" :"") + "-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]" + (isRanged ? "-0[NetRangePenalty]" :"") + "+?{" + (isMental ? "MOCV" : "OCV") + " Modifier|0}[Modifiers]]]"+(isAoE ? " (AoE)}}" : "}}");
 						} else {
-							theRoll	+= "{{" + (isMental ? "OMCV=[[@{omcv}[OMCV]"  : "OCV=[[@{ocv}[OCV]") + (isSet ? "+1[Set]" :"") + "-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]" + (isRanged ? "-0[NetRangePenalty]" :"") + "+?{" + (isMental ? "MOCV" : "OCV") + " Modifier|0}[Modifiers]]]}}"+"{{Result=[[3d6cf6cs1]]"+(isAoE ? " (AoE)}}" : "}}");
+							theRoll	+= "{{" + (isMental ? "OMCV=[[@{omcvNet}[OMCV]"  : "OCV=[[@{ocvNet}[OCV]") + (isSet ? "+1[Set]" :"") + "-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]" + (isRanged ? "-0[NetRangePenalty]" :"") + "+?{" + (isMental ? "MOCV" : "OCV") + " Modifier|0}[Modifiers]]]}}"+"{{Result=[[3d6cf6cs1]]"+(isAoE ? " (AoE)}}" : "}}");
 						}
 					}
 				}
@@ -22722,9 +22722,9 @@
 					}
 					
 					if (dispDoS) {
-						theRoll	+= "{{Hit DCV=[[11-3d6cf6cs1[Roll]+@{ocv}[OCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{ocvMod}[CSL]-@{targetOCVPenalty}[TargetOCV]-@{rangeOCVPenalty}[RangeOCV]+(?{Modifiers|0})[Modifiers]]]}}";
+						theRoll	+= "{{Hit DCV=[[11-3d6cf6cs1[Roll]+@{ocvNet}[OCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{ocvMod}[CSL]-@{targetOCVPenalty}[TargetOCV]-@{rangeOCVPenalty}[RangeOCV]+(?{Modifiers|0})[Modifiers]]]}}";
 					} else {
-						theRoll += "{{OCV=[[@{ocv}[OCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]-@{targetOCVPenalty}[TargetOCV]+@{ocvMod}[CSL]-@{rangeOCVPenalty}[RangeOCV]+(?{Modifiers|0})[Modifiers] ]]}}" + "{{Result=[[3d6cf6cs1]]}}";
+						theRoll += "{{OCV=[[@{ocvNet}[OCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]-@{targetOCVPenalty}[TargetOCV]+@{ocvMod}[CSL]-@{rangeOCVPenalty}[RangeOCV]+(?{Modifiers|0})[Modifiers] ]]}}" + "{{Result=[[3d6cf6cs1]]}}";
 					}
 					theRoll	+= (subtractENDAmt ? "{{END=[[@{martialManeuverEndurance"+maneuverId+"}]] (@{CurrentEND})}}" : "");
 					theRoll += "{{" + damageLabel + " = [Roll](~hiddenDamageRoll)}}";
@@ -22737,9 +22737,9 @@
 					theRoll += "{{data="+netDCV+"}}";
 					
 					if (dispDoS) {
-						theRoll	+= "{{versus OCV=[[11-3d6cf6cs1[Roll]+@{ocv}[OCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{ocvMod}[CSL]+(?{Modifiers|0})[Modifiers]]]}} ";
+						theRoll	+= "{{versus OCV=[[11-3d6cf6cs1[Roll]+@{ocvNet}[OCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{ocvMod}[CSL]+(?{Modifiers|0})[Modifiers]]]}} ";
 					} else {
-						theRoll += "{{OCV=[[@{ocv}[OCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{ocvMod}[CSL]+(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]}} ";
+						theRoll += "{{OCV=[[@{ocvNet}[OCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{ocvMod}[CSL]+(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]}} ";
 					}
 					if (subtractENDAmt != 0) {
 						theRoll	+= "{{END=[[@{martialManeuverEndurance"+maneuverId+"}]] (@{CurrentEND})}}";
@@ -24095,21 +24095,21 @@
 				// Attack and damage rolls.
 				if (isMental) {
 					if (dispDoS) {
-						theRoll	+= "{{Hit DMCV=[[11-3d6cf6cs1[Roll]+@{omcv}[OMCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]+@{weaponOCV"+weaponId+"}[WeaponOCV]+(?{Modifiers|0})[Modifiers]]]"+(isAoE ? " (AoE)}}" : "}}");
+						theRoll	+= "{{Hit DMCV=[[11-3d6cf6cs1[Roll]+@{omcvNet}[OMCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]+@{weaponOCV"+weaponId+"}[WeaponOCV]+(?{Modifiers|0})[Modifiers]]]"+(isAoE ? " (AoE)}}" : "}}");
 					} else {
-						theRoll += "{{OMCV=[[@{omcv}[OMCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]+@{weaponOCV"+weaponId+"}[WeaponOCV]+(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]"+(isAoE ? " (AoE)}}" : "}}");
+						theRoll += "{{OMCV=[[@{omcvNet}[OMCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]+@{weaponOCV"+weaponId+"}[WeaponOCV]+(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]"+(isAoE ? " (AoE)}}" : "}}");
 					}
 				} else if (isRanged && hasRangePenalty) {
 					if (dispDoS) {
-						theRoll	+= "{{Hit DCV=[[11-3d6cf6cs1[Roll]+@{ocv}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]" + (isSet ? "+1[Set]" :"") +"+@{weaponOCV"+weaponId+"}[WeaponOCV]-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]+@{weaponPenalty"+weaponId+"}[Strength]-@{rangeOCVPenalty}[RangeOCV]+@{weaponRangeMod"+weaponId+"}[RangeMod]"+ (isBraced ? "+2[Braced]" :"") +"+(?{Modifiers|0})[Modifiers]]]"+(isAoE ? " (AoE)}}" : "}}");
+						theRoll	+= "{{Hit DCV=[[11-3d6cf6cs1[Roll]+@{ocvNet}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]" + (isSet ? "+1[Set]" :"") +"+@{weaponOCV"+weaponId+"}[WeaponOCV]-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]+@{weaponPenalty"+weaponId+"}[Strength]-@{rangeOCVPenalty}[RangeOCV]+@{weaponRangeMod"+weaponId+"}[RangeMod]"+ (isBraced ? "+2[Braced]" :"") +"+(?{Modifiers|0})[Modifiers]]]"+(isAoE ? " (AoE)}}" : "}}");
 					} else {
-						theRoll += "{{OCV=[[@{ocv}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]" + (isSet ? "+1[Set]" :"") +"+@{weaponOCV"+weaponId+"}[WeaponOCV]-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]+@{weaponPenalty"+weaponId+"}[Strength]-@{rangeOCVPenalty}[RangeOCV]+@{weaponRangeMod"+weaponId+"}[RangeMod]"+ (isBraced ? "+2[Braced]" :"") +"+(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]"+(isAoE ? " (AoE)}}" : "}}");
+						theRoll += "{{OCV=[[@{ocvNet}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]" + (isSet ? "+1[Set]" :"") +"+@{weaponOCV"+weaponId+"}[WeaponOCV]-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]+@{weaponPenalty"+weaponId+"}[Strength]-@{rangeOCVPenalty}[RangeOCV]+@{weaponRangeMod"+weaponId+"}[RangeMod]"+ (isBraced ? "+2[Braced]" :"") +"+(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]"+(isAoE ? " (AoE)}}" : "}}");
 					}
 				} else {
 					if (dispDoS) {
-						theRoll	+= "{{Hit DCV=[[11-3d6cf6cs1[Roll]+@{ocv}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]" + (isSet ? "+1[Set]" :"") +"+@{weaponOCV"+weaponId+"}[WeaponOCV]" + (isShield ? "-[[@{shieldDCV}]][ShieldDCV]" : "") + "-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]" + (strengthPenalty ? ("+" + penaltyOCV.toString() + "[Strength]") : ("+@{weaponPenalty"+weaponId+"}[Strength]")) + (isRanged ? "-0[NetRangePenalty]" :"") +"+(?{Modifiers|0})[Modifiers]]]"+(isAoE ? " (AoE)}}" : "}}");
+						theRoll	+= "{{Hit DCV=[[11-3d6cf6cs1[Roll]+@{ocvNet}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]" + (isSet ? "+1[Set]" :"") +"+@{weaponOCV"+weaponId+"}[WeaponOCV]" + (isShield ? "-[[@{shieldDCV}]][ShieldDCV]" : "") + "-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]" + (strengthPenalty ? ("+" + penaltyOCV.toString() + "[Strength]") : ("+@{weaponPenalty"+weaponId+"}[Strength]")) + (isRanged ? "-0[NetRangePenalty]" :"") +"+(?{Modifiers|0})[Modifiers]]]"+(isAoE ? " (AoE)}}" : "}}");
 					} else {
-						theRoll += "{{OCV=[[@{ocv}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]" + (isSet ? "+1[Set]" :"") +"+@{weaponOCV"+weaponId+"}[WeaponOCV]"+ (isShield ? "-[[@{shieldDCV}]][ShieldDCV]" : "") + "-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]" + (strengthPenalty ? ("+" + penaltyOCV.toString() + "[Strength]") : ("+@{weaponPenalty"+weaponId+"}[Strength]")) + (isRanged ? "-0[NetRangePenalty]" :"") +"+(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]"+(isAoE ? " (AoE)}}" : "}}");
+						theRoll += "{{OCV=[[@{ocvNet}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]" + (isSet ? "+1[Set]" :"") +"+@{weaponOCV"+weaponId+"}[WeaponOCV]"+ (isShield ? "-[[@{shieldDCV}]][ShieldDCV]" : "") + "-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]" + (strengthPenalty ? ("+" + penaltyOCV.toString() + "[Strength]") : ("+@{weaponPenalty"+weaponId+"}[Strength]")) + (isRanged ? "-0[NetRangePenalty]" :"") +"+(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]"+(isAoE ? " (AoE)}}" : "}}");
 					}
 				}
 				
@@ -24124,9 +24124,9 @@
 				theRoll += "{{data="+netDCV+"}}";
 				
 				if (dispDoS) {
-					theRoll	+= "{{versus OCV=[[11-3d6cf6cs1[Roll]+@{ocv}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]+@{weaponOCV"+weaponId+"}[WeaponOCV]" + (isShield ? "+[[@{shieldDCV}]][ShieldDCV]" : "") + "+@{weaponPenalty"+weaponId+"}[Strength]+(?{Modifiers|0})[Modifiers]]]}} ";
+					theRoll	+= "{{versus OCV=[[11-3d6cf6cs1[Roll]+@{ocvNet}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]+@{weaponOCV"+weaponId+"}[WeaponOCV]" + (isShield ? "+[[@{shieldDCV}]][ShieldDCV]" : "") + "+@{weaponPenalty"+weaponId+"}[Strength]+(?{Modifiers|0})[Modifiers]]]}} ";
 				} else {
-					theRoll += "{{OCV=[[@{ocv}[OCV]+@{weaponOCV"+weaponId+"}[WeaponOCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]" + (isShield ? "+[[@{shieldDCV}]][ShieldDCV]" : "") + "+@{weaponPenalty"+weaponId+"}[Strength]+(?{Modifiers|0})[Modifiers]]]}} " + "{{Result=[[3d6cf6cs1]]}}";
+					theRoll += "{{OCV=[[@{ocvNet}[OCV]+@{weaponOCV"+weaponId+"}[WeaponOCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]" + (isShield ? "+[[@{shieldDCV}]][ShieldDCV]" : "") + "+@{weaponPenalty"+weaponId+"}[Strength]+(?{Modifiers|0})[Modifiers]]]}} " + "{{Result=[[3d6cf6cs1]]}}";
 				}
 				theRoll	+= (subtractENDAmt ? "{{END=[[1]] (@{CurrentEND})}}" : "");
 			}
@@ -24291,9 +24291,9 @@
 				theRoll += "{{data="+netDCV+"}}";
 				
 				if (dispDoS) {
-					theRoll	+= "{{versus OCV=[[11-3d6cf6cs1[Roll]+@{ocv}[OCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{martialManeuverOCVmod"+maneuverId+"}[CSL]+@{weaponOCV"+weaponId+"}[WeaponOCV]" + (isShield ? "+[[@{shieldDCV}]][ShieldDCV]" : "") + "+@{weaponPenalty"+weaponId+"}[STR]+(?{Modifiers|0})[Modifiers]]]}} ";
+					theRoll	+= "{{versus OCV=[[11-3d6cf6cs1[Roll]+@{ocvNet}[OCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{martialManeuverOCVmod"+maneuverId+"}[CSL]+@{weaponOCV"+weaponId+"}[WeaponOCV]" + (isShield ? "+[[@{shieldDCV}]][ShieldDCV]" : "") + "+@{weaponPenalty"+weaponId+"}[STR]+(?{Modifiers|0})[Modifiers]]]}} ";
 				} else {
-					theRoll += "{{OCV=[[@{ocv}[OCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{martialManeuverOCVmod"+maneuverId+"}[CSL]+@{weaponOCV"+weaponId+"}[WeaponOCV]" + (isShield ? "+[[@{shieldDCV}]][ShieldDCV]" : "") + "+@{weaponPenalty"+weaponId+"}[Strength]+(?{Modifiers|0})[Modifiers]]]}} " + "{{Result=[[3d6cf6cs1]]}}";
+					theRoll += "{{OCV=[[@{ocvNet}[OCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{martialManeuverOCVmod"+maneuverId+"}[CSL]+@{weaponOCV"+weaponId+"}[WeaponOCV]" + (isShield ? "+[[@{shieldDCV}]][ShieldDCV]" : "") + "+@{weaponPenalty"+weaponId+"}[Strength]+(?{Modifiers|0})[Modifiers]]]}} " + "{{Result=[[3d6cf6cs1]]}}";
 				}
 				
 				if (subtractENDAmt != 0) {
@@ -24338,21 +24338,21 @@
 				// Roll details.
 				if (isMental) {
 					if (dispDoS) {
-						theRoll	+= "{{Hit DMCV=[[11-3d6cf6cs1[Roll]+@{omcv}[OMCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{martialManeuverOCVmod}[CSL]+@{weaponOCV"+weaponId+"}[WeaponOCV]+(?{Modifiers|0})[Modifiers]]]"+(isAoE ? " (AoE)}}" : "}}");
+						theRoll	+= "{{Hit DMCV=[[11-3d6cf6cs1[Roll]+@{omcvNet}[OMCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{martialManeuverOCVmod}[CSL]+@{weaponOCV"+weaponId+"}[WeaponOCV]+(?{Modifiers|0})[Modifiers]]]"+(isAoE ? " (AoE)}}" : "}}");
 					} else {
-						theRoll += "{{OMCV=[[@{omcv}[OMCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{martialManeuverOCVmod}[CSL]+@{weaponOCV"+weaponId+"}[WeaponOCV]+(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]"+(isAoE ? " (AoE)}}" : "}}");
+						theRoll += "{{OMCV=[[@{omcvNet}[OMCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{martialManeuverOCVmod}[CSL]+@{weaponOCV"+weaponId+"}[WeaponOCV]+(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]"+(isAoE ? " (AoE)}}" : "}}");
 					}
 				} else if (isRanged && hasRangePenalty) {
 					if (dispDoS) {
-						theRoll	+= "{{Hit DCV=[[11-3d6cf6cs1[Roll]+@{ocv}[OCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{martialManeuverOCVmod"+maneuverId+"}[CSL]" + (isSet ? "+1[Set]" :"") +"+@{weaponOCV"+weaponId+"}[WeaponOCV]-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]+@{weaponPenalty"+weaponId+"}[STR]-@{rangeOCVPenalty}[RangeOCV]+@{weaponRangeMod"+weaponId+"}[RMod]+@{martialManeuverRNGmod"+maneuverId+"}[ManRMod]"+ (isBraced ? "+2[Braced]" :"") +"+(?{Modifiers|0})[Modifiers]]]"+(isAoE ? " (AoE)}}" : "}}");
+						theRoll	+= "{{Hit DCV=[[11-3d6cf6cs1[Roll]+@{ocvNet}[OCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{martialManeuverOCVmod"+maneuverId+"}[CSL]" + (isSet ? "+1[Set]" :"") +"+@{weaponOCV"+weaponId+"}[WeaponOCV]-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]+@{weaponPenalty"+weaponId+"}[STR]-@{rangeOCVPenalty}[RangeOCV]+@{weaponRangeMod"+weaponId+"}[RMod]+@{martialManeuverRNGmod"+maneuverId+"}[ManRMod]"+ (isBraced ? "+2[Braced]" :"") +"+(?{Modifiers|0})[Modifiers]]]"+(isAoE ? " (AoE)}}" : "}}");
 					} else {
-						theRoll += "{{OCV=[[@{ocv}[OCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{martialManeuverOCVmod"+maneuverId+"}[CSL]" + (isSet ? "+1[Set]" :"") +"+@{weaponOCV"+weaponId+"}[WeaponOCV]-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]+@{weaponPenalty"+weaponId+"}[STR]-@{rangeOCVPenalty}[RangeOCV]+@{weaponRangeMod"+weaponId+"}[RMod]+@{martialManeuverRNGmod"+maneuverId+"}[ManRMod]"+ (isBraced ? "+2[Braced]" :"") +"+(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]"+(isAoE ? " (AoE)}}" : "}}");
+						theRoll += "{{OCV=[[@{ocvNet}[OCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{martialManeuverOCVmod"+maneuverId+"}[CSL]" + (isSet ? "+1[Set]" :"") +"+@{weaponOCV"+weaponId+"}[WeaponOCV]-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]+@{weaponPenalty"+weaponId+"}[STR]-@{rangeOCVPenalty}[RangeOCV]+@{weaponRangeMod"+weaponId+"}[RMod]+@{martialManeuverRNGmod"+maneuverId+"}[ManRMod]"+ (isBraced ? "+2[Braced]" :"") +"+(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]"+(isAoE ? " (AoE)}}" : "}}");
 					}
 				} else {
 					if (dispDoS) {
-						theRoll	+= "{{Hit DCV=[[11-3d6cf6cs1[Roll]+@{ocv}[OCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{martialManeuverOCVmod"+maneuverId+"}[CSL]" + (isSet ? "+1[Set]" :"") +"+@{weaponOCV"+weaponId+"}[WeaponOCV]" + (isShield ? "-[[@{shieldDCV}]][ShieldDCV]" : "") + "-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]" + (strengthPenalty ? ("+" + penaltyOCV.toString() + "[STR]") : ("+@{weaponPenalty"+weaponId+"}[STR]")) + (isRanged ? "-0[NetRangePenalty]" :"") +"+(?{Modifiers|0})[Modifiers]]]"+(isAoE ? " (AoE)}}" : "}}");
+						theRoll	+= "{{Hit DCV=[[11-3d6cf6cs1[Roll]+@{ocvNet}[OCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{martialManeuverOCVmod"+maneuverId+"}[CSL]" + (isSet ? "+1[Set]" :"") +"+@{weaponOCV"+weaponId+"}[WeaponOCV]" + (isShield ? "-[[@{shieldDCV}]][ShieldDCV]" : "") + "-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]" + (strengthPenalty ? ("+" + penaltyOCV.toString() + "[STR]") : ("+@{weaponPenalty"+weaponId+"}[STR]")) + (isRanged ? "-0[NetRangePenalty]" :"") +"+(?{Modifiers|0})[Modifiers]]]"+(isAoE ? " (AoE)}}" : "}}");
 					} else {
-						theRoll += "{{OCV=[[@{ocv}[OCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{martialManeuverOCVmod"+maneuverId+"}[CSL]" + (isSet ? "+1[Set]" :"") +"+@{weaponOCV"+weaponId+"}[WeaponOCV]"+ (isShield ? "-[[@{shieldDCV}]][ShieldDCV]" : "") + "-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]" + (strengthPenalty ? ("+" + penaltyOCV.toString() + "[STR]") : ("+@{weaponPenalty"+weaponId+"}[STR]")) + (isRanged ? "-0[NetRangePenalty]" :"") +"+(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]"+(isAoE ? " (AoE)}}" : "}}");
+						theRoll += "{{OCV=[[@{ocvNet}[OCV]+@{martialManeuverOCV"+maneuverId+"}[ManOCV]+@{martialManeuverOCVmod"+maneuverId+"}[CSL]" + (isSet ? "+1[Set]" :"") +"+@{weaponOCV"+weaponId+"}[WeaponOCV]"+ (isShield ? "-[[@{shieldDCV}]][ShieldDCV]" : "") + "-[[" + (isAoE ? 0 : 1) + "*@{targetOCVPenalty}]][TargetOCV]" + (strengthPenalty ? ("+" + penaltyOCV.toString() + "[STR]") : ("+@{weaponPenalty"+weaponId+"}[STR]")) + (isRanged ? "-0[NetRangePenalty]" :"") +"+(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]"+(isAoE ? " (AoE)}}" : "}}");
 					}
 				}
 				
@@ -24822,15 +24822,15 @@
 				// Attack and damage rolls.
 				if (isRanged && hasRangePenalty) {
 					if (dispDoS) {
-						theRoll	+= "{{Hit DCV=[[11-3d6cf6cs1[Roll]+@{ocv}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]" + (isSet ? "+1[Set]" :"") + "-[[@{targetOCVPenalty}]][TargetOCV]-@{rangeOCVPenalty}[RangeOCV]"+ (isBraced ? "+2[Braced]+" :"+") +"(?{Modifiers|0})[Modifiers]]]}} ";
+						theRoll	+= "{{Hit DCV=[[11-3d6cf6cs1[Roll]+@{ocvNet}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]" + (isSet ? "+1[Set]" :"") + "-[[@{targetOCVPenalty}]][TargetOCV]-@{rangeOCVPenalty}[RangeOCV]"+ (isBraced ? "+2[Braced]+" :"+") +"(?{Modifiers|0})[Modifiers]]]}} ";
 					} else {
-						theRoll += "{{OCV=[[@{ocv}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]" + (isSet ? "+1[Set]" :"") + "-[[@{targetOCVPenalty}]][TargetOCV]-@{rangeOCVPenalty}[RangeOCV]"+ (isBraced ? "+2[Braced]+" :"+") +"(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]}}";
+						theRoll += "{{OCV=[[@{ocvNet}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]" + (isSet ? "+1[Set]" :"") + "-[[@{targetOCVPenalty}]][TargetOCV]-@{rangeOCVPenalty}[RangeOCV]"+ (isBraced ? "+2[Braced]+" :"+") +"(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]}}";
 					}
 				} else {
 					if (dispDoS) {
-						theRoll	+= "{{Hit DCV=[[11-3d6cf6cs1[Roll]+@{ocv}[OCV]+" + maneuverOCV.toString() +"[ManOCV]+@{maneuverOCVmod}[CSL]" + (isSet ? "+1[Set]" :"") + "-[[@{targetOCVPenalty}]][TargetOCV]"+ (isRanged ? "-0[NetRangePenalty]+" :"+") +"(?{Modifiers|0})[Modifiers]]]}} ";
+						theRoll	+= "{{Hit DCV=[[11-3d6cf6cs1[Roll]+@{ocvNet}[OCV]+" + maneuverOCV.toString() +"[ManOCV]+@{maneuverOCVmod}[CSL]" + (isSet ? "+1[Set]" :"") + "-[[@{targetOCVPenalty}]][TargetOCV]"+ (isRanged ? "-0[NetRangePenalty]+" :"+") +"(?{Modifiers|0})[Modifiers]]]}} ";
 					} else {
-						theRoll += "{{OCV=[[@{ocv}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]" + (isSet ? "+1[Set]" :"") + "-[[@{targetOCVPenalty}]][TargetOCV]"+ (isRanged ? "-0[NetRangePenalty]+" :"+") +"(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]}}";
+						theRoll += "{{OCV=[[@{ocvNet}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]" + (isSet ? "+1[Set]" :"") + "-[[@{targetOCVPenalty}]][TargetOCV]"+ (isRanged ? "-0[NetRangePenalty]+" :"+") +"(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]}}";
 					}
 				}
 				
@@ -24845,9 +24845,9 @@
 				theRoll += "{{data="+netDCV+"}}";
 				
 				if (dispDoS) {
-					theRoll	+= "{{versus OCV=[[11-3d6cf6cs1[Roll]+@{ocv}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]+(?{Modifiers|0})[Modifiers]]]}} ";
+					theRoll	+= "{{versus OCV=[[11-3d6cf6cs1[Roll]+@{ocvNet}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]+(?{Modifiers|0})[Modifiers]]]}} ";
 				} else {
-					theRoll += "{{OCV=[[@{ocv}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]+(?{Modifiers|0})[Modifiers]]]}} " + "{{Result=[[3d6cf6cs1]]}}";
+					theRoll += "{{OCV=[[@{ocvNet}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]+(?{Modifiers|0})[Modifiers]]]}} " + "{{Result=[[3d6cf6cs1]]}}";
 				}
 				
 				theRoll	+= (subtractENDAmt ? "{{END=[[1]] (@{CurrentEND})}}" : "");
@@ -24859,9 +24859,9 @@
 				theRoll += "{{data="+netDCV+"}}";
 				
 				if (dispDoS) {
-					theRoll	+= "{{Grabs DCV=[[11-3d6cf6cs1[Roll]+@{ocv}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]-[[@{targetOCVPenalty}]][TargetOCV]+(?{Modifiers|0})[Modifiers]]]}} ";
+					theRoll	+= "{{Grabs DCV=[[11-3d6cf6cs1[Roll]+@{ocvNet}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]-[[@{targetOCVPenalty}]][TargetOCV]+(?{Modifiers|0})[Modifiers]]]}} ";
 				} else {
-					theRoll += "{{OCV=[[@{ocv}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]-[[@{targetOCVPenalty}]][TargetOCV]+(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]}}";
+					theRoll += "{{OCV=[[@{ocvNet}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]-[[@{targetOCVPenalty}]][TargetOCV]+(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]}}";
 				}
 				
 				theRoll	+= (subtractENDAmt ? "{{END=[[1]] (@{CurrentEND})}}" : "");
@@ -24873,9 +24873,9 @@
 				theRoll += "{{data="+netDCV+"}}";
 				
 				if (dispDoS) {
-					theRoll	+= "{{Grabs DCV=[[11-3d6cf6cs1[Roll]+@{ocv}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]+(?{Modifiers|0})[Modifiers]]]}} ";
+					theRoll	+= "{{Grabs DCV=[[11-3d6cf6cs1[Roll]+@{ocvNet}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]+(?{Modifiers|0})[Modifiers]]]}} ";
 				} else {
-					theRoll += "{{OCV=[[@{ocv}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]+(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]}}";
+					theRoll += "{{OCV=[[@{ocvNet}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]+(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]}}";
 				}
 				
 				theRoll	+= (subtractENDAmt ? "{{END=[[@{hiddenBasicEndurance}]] (@{CurrentEND})}}" : "");
@@ -24889,9 +24889,9 @@
 				theRoll += "{{data="+netDCV+"}}";
 				
 				if (dispDoS) {
-					theRoll	+= "{{Hit DCV=[[11-3d6cf6cs1[Roll]+@{ocv}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]-[[@{targetOCVPenalty}]][TargetOCV]+(?{Modifiers|0})[Modifiers]]]}} ";
+					theRoll	+= "{{Hit DCV=[[11-3d6cf6cs1[Roll]+@{ocvNet}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]-[[@{targetOCVPenalty}]][TargetOCV]+(?{Modifiers|0})[Modifiers]]]}} ";
 				} else {
-					theRoll += "{{OCV=[[@{ocv}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]-[[@{targetOCVPenalty}]][TargetOCV]+(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]}}";
+					theRoll += "{{OCV=[[@{ocvNet}[OCV]+" + maneuverOCV.toString() + "[ManOCV]+@{maneuverOCVmod}[CSL]-[[@{targetOCVPenalty}]][TargetOCV]+(?{Modifiers|0})[Modifiers]]]}}" + "{{Result=[[3d6cf6cs1]]}}";
 				}
 				
 				theRoll	+= (subtractENDAmt ? "{{END=[[1]] (@{CurrentEND})}}" : "");
@@ -25815,8 +25815,8 @@
 			version = 4.65;
 		}
 		
-		if (version < 4.7) {
-			version = 4.7;
+		if (version < 4.71) {
+			version = 4.71;
 		}
 		
 		if (version != origVersion) {