diff --git a/packages/website-ue/src/core/tankopedia/aggregateStageParameters.ts b/packages/website-ue/src/core/tankopedia/aggregateStageParameters.ts
index d95ee6b01..984e1bdf3 100644
--- a/packages/website-ue/src/core/tankopedia/aggregateStageParameters.ts
+++ b/packages/website-ue/src/core/tankopedia/aggregateStageParameters.ts
@@ -11,7 +11,6 @@ import {
   TankAttributeChange_Modifier,
   VisualChanges,
 } from "@protos/blitz_static_tank_upgrade_single_stage";
-import { times } from "lodash-es";
 
 function patch(stage0: StageParameters, stage1: StageParameters) {
   if (stage1.stage_number !== ++stage0.stage_number) {
@@ -207,7 +206,9 @@ export function aggregateStageParameters(
 
   stage0.stage_number = 0;
 
-  times(stage, (index) => patch(stage0, stages[index]));
+  console.log(stages.length);
+
+  stages.forEach((stage) => patch(stage0, stage));
 
   return stage0;
 }
diff --git a/packages/website-ue/src/core/tankopedia/characteristics.ts b/packages/website-ue/src/core/tankopedia/characteristics.ts
index c15bdfe0c..05e16750c 100644
--- a/packages/website-ue/src/core/tankopedia/characteristics.ts
+++ b/packages/website-ue/src/core/tankopedia/characteristics.ts
@@ -117,4 +117,10 @@ export const characteristics = {
     );
     return count === -1 || count === null ? Infinity : count;
   },
+
+  aim_time({ attribute }) {
+    return attribute(
+      TankAttributeChange_AttributeName.ATTRIBUTE_NAME_AIMING_TIME
+    );
+  },
 } satisfies Record<string, Characteristic>;
diff --git a/packages/website-ue/src/core/tankopedia/characteristicsGroups.ts b/packages/website-ue/src/core/tankopedia/characteristicsGroups.ts
index 2581387e7..3d2a8489a 100644
--- a/packages/website-ue/src/core/tankopedia/characteristicsGroups.ts
+++ b/packages/website-ue/src/core/tankopedia/characteristicsGroups.ts
@@ -40,6 +40,7 @@ export const characteristicsGroups = [
       { name: "shell_velocity" },
       { name: "shell_range" },
       { name: "shell_capacity" },
+      { name: "aim_time" },
     ],
   },
   {
diff --git a/packages/website-ue/src/pages/tanks/[slug]/_index.tsx b/packages/website-ue/src/pages/tanks/[slug]/_index.tsx
index 03b96902f..b258ca024 100644
--- a/packages/website-ue/src/pages/tanks/[slug]/_index.tsx
+++ b/packages/website-ue/src/pages/tanks/[slug]/_index.tsx
@@ -23,7 +23,7 @@ function Content({ id }: { id: string }) {
     () =>
       aggregateStageParameters(
         tank.base_stats!,
-        tank.upgrade_stages,
+        tank.upgrade_stages.slice(0, protagonist.stage),
         protagonist.shell
       ),
     [protagonist]
@@ -38,7 +38,7 @@ function Content({ id }: { id: string }) {
       <h1>{id}</h1>
 
       <div style={{ display: "flex", flexWrap: "wrap" }}>
-        {times(tank.upgrade_stages.length, (index) => (
+        {times(tank.upgrade_stages.length + 1, (index) => (
           <button
             key={index}
             onClick={() => {