diff --git a/bun.lockb b/bun.lockb
index 8d88af904..89dea1714 100644
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/src/app/tools/compare/page.tsx b/src/app/tools/compare/page.tsx
index 1e9d8879b..4daa94fed 100644
--- a/src/app/tools/compare/page.tsx
+++ b/src/app/tools/compare/page.tsx
@@ -60,8 +60,8 @@ export default function Page() {
           },
           {
             equipmentDefinitions: awaitedEquipmentDefinitions,
-            modelDefinitions: awaitedModelDefinitions,
             provisionDefinitions: awaitedProvisionDefinitions,
+            tankModelDefinition: awaitedModelDefinitions[thisMember.tank.id],
           },
         ),
       ),
diff --git a/src/app/tools/tankopedia/[id]/components/Model/HeroSection.tsx b/src/app/tools/tankopedia/[id]/components/Model/HeroSection.tsx
index 6cf348687..d2c728148 100644
--- a/src/app/tools/tankopedia/[id]/components/Model/HeroSection.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Model/HeroSection.tsx
@@ -3,7 +3,7 @@ import { Box, Button, Flex, Heading, Text } from '@radix-ui/themes';
 import Link from 'next/link';
 import { Suspense, use, useEffect, useMemo, useState } from 'react';
 import { classIcons } from '../../../../../../components/ClassIcon';
-import { ThicknessRange } from '../../../../../../components/StaticArmor/components/StaticArmorScene';
+import { ThicknessRange } from '../../../../../../components/StaticArmor';
 import { resolveNearPenetration } from '../../../../../../core/blitz/resolveNearPenetration';
 import { tankDefinitions } from '../../../../../../core/blitzkit/tankDefinitions';
 import { TIER_ROMAN_NUMERALS } from '../../../../../../core/blitzkit/tankDefinitions/constants';
diff --git a/src/app/tools/tankopedia/[id]/components/Model/TankSandbox.tsx b/src/app/tools/tankopedia/[id]/components/Model/TankSandbox.tsx
index d90808e24..7a834e0a4 100644
--- a/src/app/tools/tankopedia/[id]/components/Model/TankSandbox.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Model/TankSandbox.tsx
@@ -3,8 +3,10 @@ import { Suspense, useEffect, useRef } from 'react';
 import { Armor } from '../../../../../../components/Armor';
 import { ArmorPlateDisplay } from '../../../../../../components/Armor/components/ArmorPlateDisplay';
 import { ShotDisplay } from '../../../../../../components/Armor/components/ShotDisplay';
-import { StaticArmor } from '../../../../../../components/StaticArmor';
-import { ThicknessRange } from '../../../../../../components/StaticArmor/components/StaticArmorScene';
+import {
+  StaticArmor,
+  ThicknessRange,
+} from '../../../../../../components/StaticArmor';
 import { applyPitchYawLimits } from '../../../../../../core/blitz/applyPitchYawLimits';
 import { modelTransformEvent } from '../../../../../../core/blitzkit/modelTransform';
 import { Pose, poseEvent } from '../../../../../../core/blitzkit/pose';
diff --git a/src/app/tools/tankopedia/[id]/components/Model/components/Options.tsx b/src/app/tools/tankopedia/[id]/components/Model/components/Options.tsx
index cc966c636..04ced02d9 100644
--- a/src/app/tools/tankopedia/[id]/components/Model/components/Options.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Model/components/Options.tsx
@@ -22,7 +22,7 @@ import {
 import { useEffect, useState } from 'react';
 import { ModuleButton } from '../../../../../../../components/ModuleButtons/ModuleButton';
 import { SmallTankIcon } from '../../../../../../../components/SmallTankIcon';
-import { ThicknessRange } from '../../../../../../../components/StaticArmor/components/StaticArmorScene';
+import { ThicknessRange } from '../../../../../../../components/StaticArmor';
 import { resolveNearPenetration } from '../../../../../../../core/blitz/resolveNearPenetration';
 import { resolvePenetrationCoefficient } from '../../../../../../../core/blitz/resolvePenetrationCoefficient';
 import { asset } from '../../../../../../../core/blitzkit/asset';
diff --git a/src/app/tools/tankopedia/[id]/components/Thicknesses.tsx b/src/app/tools/tankopedia/[id]/components/Thicknesses.tsx
index 4c2c289a5..1227ef24a 100644
--- a/src/app/tools/tankopedia/[id]/components/Thicknesses.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Thicknesses.tsx
@@ -1,6 +1,6 @@
 import { EyeClosedIcon, EyeOpenIcon, ReloadIcon } from '@radix-ui/react-icons';
 import { Box, Button, Checkbox, Flex, Text } from '@radix-ui/themes';
-import { ThicknessRange } from '../../../../../components/StaticArmor/components/StaticArmorScene';
+import { ThicknessRange } from '../../../../../components/StaticArmor';
 import * as TankopediaEphemeral from '../../../../../stores/tankopediaEphemeral';
 import * as TankopediaPersistent from '../../../../../stores/tankopediaPersistent';