diff --git a/common/src/main/java/org/saturnclient/ui/components/SkinPreview.java b/common/src/main/java/org/saturnclient/ui/components/SkinPreview.java
index 58b82ab..1686c75 100644
--- a/common/src/main/java/org/saturnclient/ui/components/SkinPreview.java
+++ b/common/src/main/java/org/saturnclient/ui/components/SkinPreview.java
@@ -1,19 +1,11 @@
 package org.saturnclient.ui.components;
 
-import org.jetbrains.annotations.Nullable;
-import org.joml.Quaternionf;
-import org.joml.Vector3f;
-import org.saturnclient.common.minecraft.bindings.SaturnQuaternionf;
-import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.ui.Element;
 import org.saturnclient.ui.ElementContext;
 import org.saturnclient.ui.RenderScope;
 
-import net.minecraft.client.render.DiffuseLighting;
-import net.minecraft.client.render.entity.EntityRenderDispatcher;
-import net.minecraft.entity.LivingEntity;
-
 public class SkinPreview extends Element {
+    public static EntityDrawer DRAWER;
     private boolean negativeAngle = false;
     private float angle = 0.0f;
 
@@ -22,70 +14,13 @@ public class SkinPreview extends Element {
         this.negativeAngle = negativeAngle;
     }
 
-    public static void drawEntity(RenderScope renderScope, int x1, int y1, int x2, int y2, int size, float f,
-            float mouseX,
-            float mouseY, LivingEntity entity, float angle, boolean negativeAngle) {
-        float g = (float) (x1 + x2) / 2.0F;
-        float h = (float) (y1 + y2) / 2.0F;
-        renderScope.enableScissor(0, 6, x2, y2);
-        float i = (float) Math.atan((double) ((g - mouseX) / 40.0F));
-        float j = (float) Math.atan((double) ((h - mouseY) / 40.0F));
-        Quaternionf quaternionf = (new Quaternionf()).rotateZ(3.1415927F);
-        float k = entity.bodyYaw;
-        float l = entity.getYaw();
-        float m = entity.getPitch();
-        float n = entity.prevHeadYaw;
-        float o = entity.headYaw;
-        entity.setYaw(angle);
-        entity.bodyYaw = angle;
-        entity.setPitch(-(j * 20.0F));
-        entity.headYaw = negativeAngle ? (i * 40.0F) + 180f : -(i * 40.0F);
-        entity.prevHeadYaw = entity.getHeadYaw();
-        entity.setCustomNameVisible(false);
-
-        float p = entity.getScale();
-        Vector3f vector3f = new Vector3f(0.0F, entity.getHeight() / 2.0F + f * p, 0.0F);
-        float q = (float) size / p;
-        drawEntity(renderScope, g, h, q, vector3f, quaternionf, null, entity);
-
-        entity.setCustomNameVisible(true);
-        entity.bodyYaw = k;
-        entity.setYaw(l);
-        entity.setPitch(m);
-        entity.prevHeadYaw = n;
-        entity.headYaw = o;
-        renderScope.disableScissor();
-    }
-
-    public static void drawEntity(RenderScope renderScope, float x, float y, float size, Vector3f vector3f,
-            Quaternionf quaternionf, @Nullable Quaternionf quaternionf2, LivingEntity entity) {
-        renderScope.getMatrixStack().push();
-        renderScope.getMatrixStack().translate((double) x, (double) y, 50.0);
-        renderScope.getMatrixStack().scale(size, size, -size);
-        renderScope.getMatrixStack().translate(vector3f.x, vector3f.y, vector3f.z);
-        renderScope.getMatrixStack().multiply(new SaturnQuaternionf(quaternionf));
-        renderScope.draw();
-        DiffuseLighting.method_34742();
-        EntityRenderDispatcher entityRenderDispatcher = SaturnClient.client.getEntityRenderDispatcher();
-
-        entityRenderDispatcher.setRenderShadows(false);
-        // TODO add the method draw with vertex consumers
-        // renderScope.draw((vertexConsumers) -> {
-        //     entityRenderDispatcher.render(entity, 0.0, 0.0, 0.0, 1.0F, renderScope.getMatrixStack(), vertexConsumers,
-        //             15728880);
-        // });
-        renderScope.draw();
-        entityRenderDispatcher.setRenderShadows(true);
-        renderScope.getMatrixStack().pop();
-        DiffuseLighting.enableGuiDepthLighting();
-    }
-
     @Override
     public void render(RenderScope renderScope, ElementContext ctx) {
-        LivingEntity entity = SaturnClient.client.player;
-        if (entity != null) {
-            drawEntity(renderScope, 0, 0, 75, 78, 30, 0.0625F, ctx.mouseX / scale, ctx.mouseY / scale, entity, angle,
-                    negativeAngle);
-        }
+        DRAWER.render(renderScope, negativeAngle, angle, scale, ctx);
+    }
+
+    public static interface EntityDrawer {
+        public void render(RenderScope renderScope, boolean negativeAngle, float angle, float scale,
+                ElementContext ctx);
     }
 }
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/EntityDrawerImpl.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/EntityDrawerImpl.java
new file mode 100644
index 0000000..ba8d0c1
--- /dev/null
+++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/EntityDrawerImpl.java
@@ -0,0 +1,82 @@
+package org.saturnclient.ui;
+
+import org.jetbrains.annotations.Nullable;
+import org.joml.Quaternionf;
+import org.joml.Vector3f;
+import org.saturnclient.common.minecraft.bindings.SaturnQuaternionf;
+import org.saturnclient.saturnclient.SaturnClient;
+import org.saturnclient.ui.components.SkinPreview.EntityDrawer;
+
+import net.minecraft.client.render.DiffuseLighting;
+import net.minecraft.client.render.entity.EntityRenderDispatcher;
+import net.minecraft.entity.LivingEntity;
+
+public class EntityDrawerImpl implements EntityDrawer {
+    public static void drawEntity(RenderScope renderScope, int x1, int y1, int x2, int y2, int size, float f,
+            float mouseX,
+            float mouseY, LivingEntity entity, float angle, boolean negativeAngle) {
+        float g = (float) (x1 + x2) / 2.0F;
+        float h = (float) (y1 + y2) / 2.0F;
+        renderScope.enableScissor(0, 6, x2, y2);
+        float i = (float) Math.atan((double) ((g - mouseX) / 40.0F));
+        float j = (float) Math.atan((double) ((h - mouseY) / 40.0F));
+        Quaternionf quaternionf = (new Quaternionf()).rotateZ(3.1415927F);
+        float k = entity.bodyYaw;
+        float l = entity.getYaw();
+        float m = entity.getPitch();
+        float n = entity.prevHeadYaw;
+        float o = entity.headYaw;
+        entity.setYaw(angle);
+        entity.bodyYaw = angle;
+        entity.setPitch(-(j * 20.0F));
+        entity.headYaw = negativeAngle ? (i * 40.0F) + 180f : -(i * 40.0F);
+        entity.prevHeadYaw = entity.getHeadYaw();
+        entity.setCustomNameVisible(false);
+
+        float p = entity.getScale();
+        Vector3f vector3f = new Vector3f(0.0F, entity.getHeight() / 2.0F + f * p, 0.0F);
+        float q = (float) size / p;
+        drawEntity(renderScope, g, h, q, vector3f, quaternionf, null, entity);
+
+        entity.setCustomNameVisible(true);
+        entity.bodyYaw = k;
+        entity.setYaw(l);
+        entity.setPitch(m);
+        entity.prevHeadYaw = n;
+        entity.headYaw = o;
+        renderScope.disableScissor();
+    }
+
+    public static void drawEntity(RenderScope renderScope, float x, float y, float size, Vector3f vector3f,
+            Quaternionf quaternionf, @Nullable Quaternionf quaternionf2, LivingEntity entity) {
+        renderScope.getMatrixStack().push();
+        renderScope.getMatrixStack().translate((double) x, (double) y, 50.0);
+        renderScope.getMatrixStack().scale(size, size, -size);
+        renderScope.getMatrixStack().translate(vector3f.x, vector3f.y, vector3f.z);
+        renderScope.getMatrixStack().multiply(new SaturnQuaternionf(quaternionf));
+        renderScope.draw();
+        DiffuseLighting.method_34742();
+        EntityRenderDispatcher entityRenderDispatcher = SaturnClient.client.getEntityRenderDispatcher();
+
+        entityRenderDispatcher.setRenderShadows(false);
+        // TODO add the method draw with vertex consumers
+        // renderScope.draw((vertexConsumers) -> {
+        // entityRenderDispatcher.render(entity, 0.0, 0.0, 0.0, 1.0F,
+        // renderScope.getMatrixStack(), vertexConsumers,
+        // 15728880);
+        // });
+        renderScope.draw();
+        entityRenderDispatcher.setRenderShadows(true);
+        renderScope.getMatrixStack().pop();
+        DiffuseLighting.enableGuiDepthLighting();
+    }
+
+    @Override
+    public void render(RenderScope renderScope, boolean negativeAngle, float angle, float scale, ElementContext ctx) {
+        LivingEntity entity = SaturnClient.client.player;
+        if (entity != null) {
+            drawEntity(renderScope, 0, 0, 75, 78, 30, 0.0625F, ctx.mouseX / scale, ctx.mouseY / scale, entity, angle,
+                    negativeAngle);
+        }
+    }
+}