diff --git a/Burning Wheel/Burning Wheel.html b/Burning Wheel/Burning Wheel.html
index 0cc493b26e..70d21bf573 100644
--- a/Burning Wheel/Burning Wheel.html	
+++ b/Burning Wheel/Burning Wheel.html	
@@ -446,7 +446,7 @@
 
 <table class="page2" style="vertical-align: top;">
     <tr>
-        <td class="statname italic">Hesitation</td><td style="float:right;"><input type="number" class="underline" name="attr_hesitation" disabled="disabled" value="10-@{will}"></td>
+        <td class="statname italic">Hesitation</td><td style="float:right;"><input type="number" class="underline" name="attr_hesitation" disabled="disabled" title="@{hesitation}"></td>
     </tr>
     <tr class="spacer"></tr>
     <tr>
@@ -2128,3 +2128,42 @@
         {{/rollGreater() stat wounddice}}
     </div>
 </rolltemplate>
+
+
+<!-- WORKERS -->
+<script type="text/worker">
+
+    on("sheet:opened", function() {
+        updateHesitation();
+	}
+	
+	// Script for updating hesitation
+    on("change:will change:will_shade", function() {
+        updateHesitation();
+    });
+	
+	var updateHesitation = function() {
+		getAttrs(['will', 'will_shade'], function(v) {
+			if(v.will_shade && v.will) {
+				var will = isNaN(parseInt(v.will, 10)) === false ? parseInt(v.will, 10) : 0;
+				// See shade calculations for Will/Hesitation pg 545 of the BWG book
+				if(v.will_shade === "3") { //Gray Shade
+					hesitation = 8 - will;
+				}
+				else if(v.will_shade === "2") { //White Shade
+					hesitation = 7 - will;
+				}
+				else { //Black Shade
+					hesitation = 10 - will;
+				}
+				if(hesitation < 0) {
+					hesitation = 0;
+				}
+				setAttrs({
+					hesitation: hesitation
+				});
+			}
+        });
+	}
+
+</script>