diff --git a/calculations.js b/calculations.js
index 7ec4438..cd662c2 100644
--- a/calculations.js
+++ b/calculations.js
@@ -159,15 +159,20 @@ function calculateNetWorthComparison(params) {
         }
     }
     
+    // Find age 65 index for retirement values
+    const age65Index = allAges.findIndex(age => age === RETIREMENT_AGE);
+    const retirementWith = age65Index >= 0 ? allWithProgram[age65Index] : allWithProgram[allWithProgram.length - 1];
+    const retirementWithout = age65Index >= 0 ? allWithoutProgram[age65Index] : allWithoutProgram[allWithoutProgram.length - 1];
+    
     return {
         ages,
         withProgram,
         withoutProgram,
         payoffYears,
         annualMatch,
-        totalRetirementWith: allWithProgram[allWithProgram.length - 1],
-        totalRetirementWithout: allWithoutProgram[allWithoutProgram.length - 1],
-        retirementDifference: allWithProgram[allWithProgram.length - 1] - allWithoutProgram[allWithoutProgram.length - 1],
+        totalRetirementWith: retirementWith,
+        totalRetirementWithout: retirementWithout,
+        retirementDifference: retirementWith - retirementWithout,
         // Include full yearly data if needed
         allAges,
         allWithProgram,
diff --git a/index.html b/index.html
index 481c4d6..9a3433c 100644
--- a/index.html
+++ b/index.html
@@ -180,9 +180,9 @@
                         <p><strong>Employer Match:</strong> 4%</p>
                     </div>
                     <div class="mt-4 p-3 bg-white rounded">
-                        <p class="text-lg font-bold text-blue-600">$275,117</p>
+                        <p class="text-lg font-bold text-blue-600">$493,553</p>
                         <p class="text-xs text-gray-600">Retirement value at age 65</p>
-                        <p class="text-xs text-blue-600 mt-1">$22,000 in matching over 11 years</p>
+                        <p class="text-xs text-blue-600 mt-1">$20,000 in matching over 10 years</p>
                     </div>
                 </div>
                 
@@ -202,9 +202,9 @@
                         <p><strong>Employer Match:</strong> 5%</p>
                     </div>
                     <div class="mt-4 p-3 bg-white rounded">
-                        <p class="text-lg font-bold text-green-600">$424,608</p>
+                        <p class="text-lg font-bold text-green-600">$729,134</p>
                         <p class="text-xs text-gray-600">Retirement value at age 65</p>
-                        <p class="text-xs text-green-600 mt-1">$59,500 in matching over 14 years</p>
+                        <p class="text-xs text-green-600 mt-1">$46,750 in matching over 11 years</p>
                     </div>
                 </div>
                 
@@ -224,9 +224,9 @@
                         <p><strong>Employer Match:</strong> 6%</p>
                     </div>
                     <div class="mt-4 p-3 bg-white rounded">
-                        <p class="text-lg font-bold text-purple-600">$285,000</p>
+                        <p class="text-lg font-bold text-purple-600">$1,064,977</p>
                         <p class="text-xs text-gray-600">Retirement value at age 65</p>
-                        <p class="text-xs text-purple-600 mt-1">$122,400 in matching over 17 years</p>
+                        <p class="text-xs text-purple-600 mt-1">$93,600 in matching over 13 years</p>
                     </div>
                 </div>
             </div>
@@ -249,9 +249,9 @@
                         <p><strong>Employer Match:</strong> 3%</p>
                     </div>
                     <div class="mt-4 p-3 bg-white rounded">
-                        <p class="text-lg font-bold text-amber-600">$58,000</p>
+                        <p class="text-lg font-bold text-amber-600">$288,373</p>
                         <p class="text-xs text-gray-600">Retirement value at age 65</p>
-                        <p class="text-xs text-amber-600 mt-1">$28,350 in matching over 21 years</p>
+                        <p class="text-xs text-amber-600 mt-1">$18,900 in matching over 14 years</p>
                     </div>
                 </div>
                 
@@ -271,7 +271,7 @@
                         <p><strong>Employer Match:</strong> 6%</p>
                     </div>
                     <div class="mt-4 p-3 bg-white rounded">
-                        <p class="text-lg font-bold text-indigo-600">$112,000</p>
+                        <p class="text-lg font-bold text-indigo-600">$1,132,220</p>
                         <p class="text-xs text-gray-600">Retirement value at age 65</p>
                         <p class="text-xs text-indigo-600 mt-1">$34,200 in matching over 6 years</p>
                     </div>
@@ -293,9 +293,9 @@
                         <p><strong>Employer Match:</strong> 4%</p>
                     </div>
                     <div class="mt-4 p-3 bg-white rounded">
-                        <p class="text-lg font-bold text-red-600">$95,000</p>
+                        <p class="text-lg font-bold text-red-600">$553,921</p>
                         <p class="text-xs text-gray-600">Retirement value at age 65</p>
-                        <p class="text-xs text-red-600 mt-1">$69,000 in matching over 23 years</p>
+                        <p class="text-xs text-red-600 mt-1">$45,000 in matching over 15 years</p>
                     </div>
                 </div>
             </div>