diff --git a/src/main/java/fr/jackcartersmith/orbsat/models/obj/OSOBJLoader.java b/src/main/java/fr/jackcartersmith/orbsat/models/obj/OSOBJLoader.java
index 1e11270..4ee5912 100644
--- a/src/main/java/fr/jackcartersmith/orbsat/models/obj/OSOBJLoader.java
+++ b/src/main/java/fr/jackcartersmith/orbsat/models/obj/OSOBJLoader.java
@@ -31,7 +31,7 @@ public class OSOBJLoader implements ICustomModelLoader{
 	@Override
 	public boolean accepts(ResourceLocation modelLocation)
 	{
-		return enabledDomains.contains(modelLocation.getResourceDomain()) && modelLocation.getResourcePath().endsWith(".obj.ie");
+		return enabledDomains.contains(modelLocation.getResourceDomain()) && modelLocation.getResourcePath().endsWith(".obj.adv");
 	}
 
 	@Override
@@ -43,8 +43,8 @@ public class OSOBJLoader implements ICustomModelLoader{
 			IModel model = OBJLoader.INSTANCE.loadModel(modelLocation);
 			if(model instanceof OBJModel)
 			{
-				OSOBJModel ieobj = new OSOBJModel(((OBJModel)model).getMatLib(), file);
-				cache.put(modelLocation, ieobj);
+				OSOBJModel osobj = new OSOBJModel(((OBJModel)model).getMatLib(), file);
+				cache.put(modelLocation, osobj);
 			}
 		}
 		OSOBJModel model = cache.get(file);
diff --git a/src/main/resources/assets/orbsat/blockstates/devices.json b/src/main/resources/assets/orbsat/blockstates/devices.json
index c8a908e..47015d0 100644
--- a/src/main/resources/assets/orbsat/blockstates/devices.json
+++ b/src/main/resources/assets/orbsat/blockstates/devices.json
@@ -34,12 +34,12 @@
 			"east": "orbsat:blocks/device_base"}
 		}],
 		"inventory,type=satellite_assembler": [{
-			"model": "orbsat:blastfurnace_preheater.obj",
+			"model": "orbsat:satellite_assembler.obj",
 			"custom": {"flip-v": true},
 			"transform": {
 				"scale": [ 0.1875, 0.1875, 0.1875 ],
-				"firstperson_righthand": { "scale": [ 0.75, 0.75, 0.75 ], "rotation": [{ "y": 180 }] },
-				"firstperson_lefthand": { "scale": [ 0.75, 0.75, 0.75 ], "rotation": [{ "y": 180 }] },
+				"firstperson_righthand": { "scale": [ 0.75, 0.75, 0.75 ], "rotation": [{ "y": 90 }] },
+				"firstperson_lefthand": { "scale": [ 0.75, 0.75, 0.75 ], "rotation": [{ "y": 90 }] },
 				"thirdperson_righthand": { "translation": [ 0, 0.09375, -0.171875 ], "rotation": [{ "x": 70 }, { "y": 70 }] },
 				"thirdperson_lefthand": { "translation": [ 0, 0.09375, -0.171875 ], "rotation": [{ "x": 70 }, { "y": 70 }] },
 				"fixed": {"scale": [ 2,2,2 ], "translation": [ 0, -0.25, 0 ], "rotation": [{ "y": 0 }]},
@@ -47,7 +47,7 @@
 			}
 		}],
 		"type=satellite_assembler": {
-			"model": "orbsat:blastfurnace_preheater.obj",
+			"model": "orbsat:satellite_assembler.obj",
 			"custom": { "flip-v": true }
 		},
 		"type=satellite_launcher": {"parent":"block/cube_all", "textures": {
diff --git a/src/main/resources/assets/orbsat/models/block/blastfurnace_preheater.mtl b/src/main/resources/assets/orbsat/models/block/blastfurnace_preheater.mtl
deleted file mode 100644
index a0868df..0000000
--- a/src/main/resources/assets/orbsat/models/block/blastfurnace_preheater.mtl
+++ /dev/null
@@ -1,2 +0,0 @@
-newmtl blastfurnace_preheater
-map_Ka orbsat:blocks/metalDevice1_blast_furnace_preheater
\ No newline at end of file
diff --git a/src/main/resources/assets/orbsat/models/block/blastfurnace_preheater.obj b/src/main/resources/assets/orbsat/models/block/blastfurnace_preheater.obj
deleted file mode 100644
index 14a795a..0000000
--- a/src/main/resources/assets/orbsat/models/block/blastfurnace_preheater.obj
+++ /dev/null
@@ -1,266 +0,0 @@
-# Model created by Damien A.W. Hazard
-mtllib blastfurnace_preheater.mtl
-
-o preheater
-v 0.375000 0.437500 0.937500
-v 0.125000 0.437500 0.937500
-v 0.375000 0.562500 0.937500
-v 0.125000 0.562500 0.937500
-v 0.625000 0.437500 0.937500
-v 0.875000 0.437500 0.937500
-v 0.625000 0.562500 0.937500
-v 0.875000 0.562500 0.937500
-v 0.750000 0.750000 0.000000
-v 0.250000 0.750000 0.000000
-v 0.000000 1.000000 0.000000
-v 1.000000 1.000000 0.000000
-v 0.750000 0.750000 -0.500000
-v 0.250000 0.750000 -0.500000
-v 0.250000 0.250000 -0.500000
-v 0.750000 0.250000 -0.500000
-v 0.750000 0.250000 0.000000
-v 0.250000 0.250000 0.000000
-v 1.000000 0.000000 0.000000
-v 1.000000 1.000000 1.000000
-v 1.000000 -0.000000 1.000000
-v 0.000000 0.000000 0.000000
-v 0.000000 1.000000 1.000000
-v 0.125000 0.875000 1.000000
-v 0.875000 0.875000 1.000000
-v 0.000000 -0.000000 1.000000
-v 0.062500 1.000000 0.937500
-v 0.062500 1.000000 0.062500
-v 0.125000 0.875000 0.687500
-v 0.875000 0.875000 0.687500
-v 0.875000 0.125000 1.000000
-v 0.125000 0.125000 1.000000
-v 0.875000 0.125000 0.687500
-v 0.125000 0.125000 0.687500
-v 0.937500 1.000000 0.937500
-v 0.937500 1.000000 0.062500
-v 0.187500 2.875001 0.187500
-v 0.187500 2.875001 0.812500
-v 0.187500 3.000001 0.812500
-v 0.187500 3.000001 0.187500
-v 0.812500 2.875001 0.812500
-v 0.812500 3.000001 0.812500
-v 0.812500 2.875001 0.187500
-v 0.812500 3.000001 0.187500
-v 0.062500 2.875001 0.937500
-v 0.937500 2.875001 0.937500
-v 0.062500 2.875001 0.062500
-v 0.937500 2.875001 0.062500
-v 0.375000 0.375000 1.000000
-v 0.625000 0.375000 1.000000
-v 0.625000 0.625000 1.000000
-v 0.375000 0.625000 1.000000
-v 0.625000 0.375000 0.875000
-v 0.625000 0.625000 0.875000
-v 0.375000 0.625000 0.875000
-v 0.375000 0.375000 0.875000
-v 0.437500 0.375000 0.937500
-v 0.562500 0.375000 0.937500
-v 0.562500 0.125000 0.937500
-v 0.437500 0.125000 0.937500
-v 0.562500 0.875000 0.937500
-v 0.437500 0.875000 0.937500
-v 0.437500 0.625000 0.937500
-v 0.562500 0.625000 0.937500
-vt 0.218750 0.406250
-vt 0.218750 0.437500
-vt 0.156250 0.437500
-vt 0.156250 0.406250
-vt 0.687500 0.062500
-vt 0.562500 0.062500
-vt 0.500000 0.000000
-vt 0.750000 0.000000
-vt 0.937500 0.593750
-vt 0.812500 0.593750
-vt 0.812500 0.468750
-vt 0.937500 0.468750
-vt 0.250000 0.000000
-vt 0.250000 0.250000
-vt 0.500000 0.250000
-vt 0.562500 0.187500
-vt 0.687500 0.187500
-vt 0.750000 0.250000
-vt -0.000000 0.250000
-vt 0.031250 0.218750
-vt 0.218750 0.218750
-vt 0.265625 0.015625
-vt 0.265625 0.234375
-vt 1.000000 0.000000
-vt 1.000000 0.250000
-vt 0.218750 0.328125
-vt 0.031250 0.328125
-vt 0.031250 0.250000
-vt 0.218750 0.250000
-vt -0.000000 0.000000
-vt 0.218750 0.031250
-vt 0.031250 0.031250
-vt 0.484375 0.015625
-vt 0.484375 0.234375
-vt 0.546875 0.718750
-vt 0.703125 0.718750
-vt 0.703125 0.750000
-vt 0.546875 0.750000
-vt 0.703125 0.906250
-vt 0.546875 0.906250
-vt 0.984375 0.250000
-vt 0.984375 0.468750
-vt 0.953125 0.437500
-vt 0.953125 0.281250
-vt 0.765625 0.250000
-vt 0.796875 0.281250
-vt 0.765625 0.468750
-vt 0.796875 0.437500
-vt 0.515625 0.250000
-vt 0.734375 0.250000
-vt 0.734375 0.718750
-vt 0.515625 0.718750
-vt 0.468750 0.562500
-vt 0.406250 0.562500
-vt 0.406250 0.500000
-vt 0.468750 0.500000
-vt 0.500000 0.500000
-vt 0.500000 0.562500
-vt 0.109375 0.328125
-vt 0.140625 0.328125
-vt 0.140625 0.390625
-vt 0.109375 0.390625
-vt 0.031250 0.437500
-vt 0.031250 0.406250
-vt 0.093750 0.406250
-vt 0.093750 0.437500
-vt 0.140625 0.515625
-vt 0.109375 0.515625
-vt 0.109375 0.453125
-vt 0.140625 0.453125
-usemtl blastfurnace_preheater
-f 6/1 8/2 7/3 5/4
-f 9/5 10/6 11/7 12/8
-f 13/9 14/10 10/11 9/12
-f 15/9 16/10 17/11 18/12
-f 16/9 13/10 9/11 17/12
-f 14/9 15/10 18/11 10/12
-f 19/13 12/14 20/15 21/7
-f 18/16 17/17 19/18 22/15
-f 17/17 9/5 12/8 19/18
-f 10/6 18/16 22/15 11/7
-f 20/14 23/19 24/20 25/21
-f 11/15 22/7 26/13 23/14
-f 11/14 23/13 27/22 28/23
-f 22/18 19/8 21/24 26/25
-f 25/26 24/27 29/28 30/29
-f 26/30 21/13 31/31 32/32
-f 21/13 20/14 25/21 31/31
-f 23/19 26/30 32/32 24/20
-f 32/26 31/27 33/28 34/29
-f 31/28 25/29 30/26 33/27
-f 24/26 32/27 34/28 29/29
-f 34/32 33/31 30/21 29/20
-f 23/13 20/7 35/33 27/22
-f 20/7 12/15 36/34 35/33
-f 37/35 38/36 39/37 40/38
-f 12/15 11/14 28/23 36/34
-f 38/35 41/36 42/37 39/38
-f 41/35 43/36 44/37 42/38
-f 40/38 39/37 42/39 44/40
-f 45/41 46/42 41/43 38/44
-f 47/45 45/41 38/44 37/46
-f 48/47 47/45 37/46 43/48
-f 43/35 37/36 40/37 44/38
-f 46/42 48/47 43/48 41/43
-f 35/49 36/50 48/51 46/52
-f 36/49 28/50 47/51 48/52
-f 28/49 27/50 45/51 47/52
-f 27/49 35/50 46/51 45/52
-f 49/53 50/54 51/55 52/56
-f 53/53 54/56 51/57 50/58
-f 55/53 56/56 49/57 52/58
-f 54/53 55/56 52/57 51/58
-f 56/53 53/56 50/57 49/58
-f 16/5 15/17 14/16 13/6
-f 60/59 59/60 58/61 57/62
-f 4/63 2/64 1/65 3/66
-f 61/67 62/68 63/69 64/70
-
-o fan
-v 0.219210 0.250460 0.847541
-v 0.187960 0.281710 0.803347
-v 0.250460 0.219210 0.714959
-v 0.281710 0.187960 0.759153
-v 0.471431 0.440181 0.714959
-v 0.502681 0.408931 0.759153
-v 0.440181 0.471431 0.847541
-v 0.408931 0.502681 0.803347
-v 0.749540 0.219210 0.847541
-v 0.718290 0.187960 0.803347
-v 0.780790 0.250460 0.714959
-v 0.812040 0.281710 0.759153
-v 0.559819 0.471431 0.714959
-v 0.591069 0.502681 0.759153
-v 0.528569 0.440181 0.847541
-v 0.497319 0.408931 0.803347
-v 0.780790 0.749540 0.847541
-v 0.812040 0.718290 0.803347
-v 0.749540 0.780790 0.714959
-v 0.718290 0.812040 0.759153
-v 0.528569 0.559819 0.714959
-v 0.497319 0.591069 0.759153
-v 0.559819 0.528569 0.847541
-v 0.591069 0.497319 0.803347
-v 0.250460 0.780790 0.847541
-v 0.281710 0.812040 0.803347
-v 0.219210 0.749540 0.714959
-v 0.187960 0.718290 0.759153
-v 0.440181 0.528569 0.714959
-v 0.408931 0.497319 0.759153
-v 0.471431 0.559819 0.847541
-v 0.502681 0.591069 0.803347
-v 0.411612 0.500000 0.875000
-v 0.500000 0.588388 0.875000
-v 0.588388 0.500000 0.875000
-v 0.500000 0.411612 0.875000
-v 0.411612 0.500000 0.687500
-v 0.500000 0.411612 0.687500
-v 0.588388 0.500000 0.687500
-v 0.500000 0.588388 0.687500
-vt 0.250000 0.406250
-vt 0.250000 0.390625
-vt 0.218750 0.390625
-vt 0.218750 0.406250
-vt 0.218750 0.328125
-vt 0.234375 0.328125
-vt 0.234375 0.406250
-vt 0.250000 0.328125
-vt 0.218750 0.296875
-vt 0.250000 0.296875
-vt 0.250000 0.250000
-vt 0.218750 0.250000
-usemtl blastfurnace_preheater
-f 65/71 66/72 67/73 68/74
-f 68/75 67/76 69/77 70/74
-f 65/71 68/74 70/75 71/78
-f 66/76 65/78 71/71 72/77
-f 67/75 66/78 72/71 69/74
-f 73/72 74/71 75/74 76/73
-f 76/75 75/76 77/77 78/74
-f 73/71 76/74 78/75 79/78
-f 74/76 73/78 79/71 80/77
-f 75/75 74/78 80/71 77/74
-f 81/72 82/71 83/74 84/73
-f 84/74 83/77 85/76 86/75
-f 81/71 84/74 86/75 87/78
-f 82/71 81/77 87/76 88/78
-f 83/75 82/78 88/71 85/74
-f 89/72 90/71 91/74 92/73
-f 92/74 91/77 93/76 94/75
-f 89/71 92/74 94/75 95/78
-f 90/71 89/77 95/76 96/78
-f 91/75 90/78 96/71 93/74
-f 97/78 98/75 99/79 100/80
-f 97/80 101/81 102/82 100/79
-f 99/80 103/81 104/82 98/79
-f 98/80 104/81 101/82 97/79
-f 100/80 102/81 103/82 99/79
\ No newline at end of file
diff --git a/src/main/resources/assets/orbsat/models/block/osSixSides.json b/src/main/resources/assets/orbsat/models/block/osSixSides.json
index aca4a24..1707dcd 100644
--- a/src/main/resources/assets/orbsat/models/block/osSixSides.json
+++ b/src/main/resources/assets/orbsat/models/block/osSixSides.json
@@ -3,16 +3,16 @@
 		"from": [ 0,0,0 ],
 		"to": [ 16,16,16 ],
 		"faces": {
-			"down": { "texture": "#bottom", "uv": [0,0,16,16] },
-			"up": { "texture": "#top", "uv": [0,0,16,16] },
-			"north": { "texture": "#north", "uv": [0,0,16,16] },
-			"south": { "texture": "#south", "uv": [0,0,16,16] },
-			"west": { "texture": "#west", "uv": [0,0,16,16] },
-			"east": { "texture": "#east", "uv": [0,0,16,16] }
+			"down": { "texture": "orbsat:blocks/device_base", "uv": [0,0,16,16] },
+			"up": { "texture": "orbsat:blocks/device_base", "uv": [0,0,16,16] },
+			"north": { "texture": "orbsat:blocks/device_base", "uv": [0,0,16,16] },
+			"south": { "texture": "orbsat:blocks/device_base", "uv": [0,0,16,16] },
+			"west": { "texture": "orbsat:blocks/device_base", "uv": [0,0,16,16] },
+			"east": { "texture": "orbsat:blocks/device_base", "uv": [0,0,16,16] }
 		}
 	}],
 	"textures":
 	{
-		"particle": "#top"
+		"particle": "orbsat:blocks/device_base"
 	}
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/orbsat/models/block/satellite_assembler.mtl b/src/main/resources/assets/orbsat/models/block/satellite_assembler.mtl
new file mode 100644
index 0000000..95618f6
--- /dev/null
+++ b/src/main/resources/assets/orbsat/models/block/satellite_assembler.mtl
@@ -0,0 +1,2 @@
+newmtl satellite_assembler
+map_Ka orbsat:blocks/satellite_assembler
diff --git a/src/main/resources/assets/orbsat/models/block/satellite_assembler.obj b/src/main/resources/assets/orbsat/models/block/satellite_assembler.obj
new file mode 100644
index 0000000..82b8a72
--- /dev/null
+++ b/src/main/resources/assets/orbsat/models/block/satellite_assembler.obj
@@ -0,0 +1,135 @@
+mtllib satellite_assembler.mtl
+o fab_lab
+v 0.996472 0.997981 -1.822489
+v 0.996472 2.998219 -1.822489
+v 1.692860 0.997981 -1.487127
+v 1.692860 2.998219 -1.487127
+v 1.864854 0.997981 -0.733574
+v 1.864854 2.998219 -0.733574
+v 1.382938 0.997981 -0.129271
+v 1.382938 2.998219 -0.129271
+v 0.610006 0.997981 -0.129271
+v 0.610006 2.998219 -0.129271
+v 0.128091 0.997981 -0.733573
+v 0.128091 2.998219 -0.733573
+v 0.300084 0.997981 -1.487127
+v 0.300084 2.998219 -1.487127
+vt 0.5000 0.5937
+vt 0.5000 0.1250
+vt 0.6562 0.1250
+vt 0.6562 0.5938
+vt 0.2500 0.6250
+vt 0.2500 0.1250
+vt 0.5000 0.1250
+vt 0.5000 0.6250
+vt 0.2500 0.1250
+vt 0.2500 0.6250
+vt 0.2500 0.1250
+vt 0.2500 0.5000
+vt 0.0000 0.5000
+vt 0.0000 0.1250
+vt 0.2500 0.6250
+vt 0.2500 0.1250
+vt 0.5000 0.1250
+vt 0.5000 0.6250
+vt 0.2500 0.1250
+vt 0.2500 0.6250
+vt 0.6562 0.5938
+vt 0.6562 0.1250
+vt 0.5000 0.5938
+vt 0.1289 0.7579
+vt 0.2717 0.7382
+vt 0.2815 0.6546
+vt 0.2028 0.6309
+vt 0.1417 0.5857
+vt 0.0896 0.6319
+vt 0.1014 0.7018
+vt 0.0000 0.0000
+vt 0.0000 0.0000
+vt 0.0000 0.0000
+vt 0.0000 0.0000
+vt 0.0000 0.0000
+vt 0.0000 0.0000
+vt 0.0000 0.0000
+usemtl satellite_assembler
+f 1/1 2/2 4/3 3/4
+f 3/5 4/6 6/7 5/8
+f 5/8 6/7 8/9 7/10
+f 7/11 8/12 10/13 9/14
+f 9/15 10/16 12/17 11/18
+f 11/18 12/17 14/19 13/20
+f 13/21 14/22 2/2 1/23
+f 1/24 3/25 5/26 7/27 9/28 11/29 13/30
+o constructor
+v 0.129361 1.000636 -1.875538
+v 0.129361 0.240983 -1.875539
+v 0.129361 1.000636 -0.124046
+v 0.129361 0.240983 -0.124047
+v 1.871430 1.000636 -1.875538
+v 1.871430 0.240983 -1.875539
+v 1.871430 1.000636 -0.124046
+v 1.871430 0.240983 -0.124047
+vt 0.5000 0.6250
+vt 0.2500 0.6250
+vt 0.2500 0.1250
+vt 0.5000 0.1250
+vt 0.0000 0.5000
+vt 0.2500 0.5000
+vt 0.2500 0.1250
+vt 0.0000 0.1250
+vt 0.2500 0.1250
+vt 0.5000 0.1250
+vt 0.5000 0.6250
+vt 0.2500 0.6250
+vt 0.5000 0.1250
+vt 0.2500 0.1250
+vt 0.7188 0.7812
+vt 0.7188 1.0000
+vt 0.0000 1.0000
+vt 0.0000 0.7812
+vt 0.0000 0.0000
+vt 0.0000 0.0000
+vt 0.0000 0.0000
+vt 0.0000 0.0000
+usemtl satellite_assembler
+f 15/38 16/39 18/40 17/41
+f 17/42 18/43 22/44 21/45
+f 21/46 22/47 20/48 19/49
+f 19/49 20/48 16/50 15/51
+f 17/52 21/53 19/54 15/55
+o base
+v 0.000000 0.000000 0.004289
+v 0.000000 0.244858 0.004289
+v 0.000000 0.000000 -1.995711
+v 0.000000 0.244858 -1.995711
+v 2.000000 0.000000 0.004289
+v 2.000000 0.244858 0.004289
+v 2.000000 0.000000 -1.995711
+v 2.000000 0.244858 -1.995711
+vt 0.7500 0.0000
+vt 0.7500 0.1250
+vt 0.0000 0.1250
+vt 0.0000 0.0000
+vt 0.7500 0.0000
+vt 0.7500 0.1250
+vt 0.0000 0.1250
+vt 0.0000 0.0000
+vt 0.7499 0.0000
+vt 0.7500 0.1246
+vt 0.0000 0.1246
+vt 0.0000 0.0000
+vt 0.7500 0.0000
+vt 0.7500 0.1250
+vt 0.0000 0.1250
+vt 0.0000 0.0000
+vt 0.7188 0.7812
+vt 0.7188 1.0000
+vt 0.0000 1.0000
+vt 0.0000 0.7812
+# vt -0.2500 -0.0000
+usemtl satellite_assembler
+f 23/60 24/61 26/62 25/63
+f 25/64 26/65 30/66 29/67
+f 29/68 30/69 28/70 27/71
+f 27/72 28/73 24/74 23/75
+f 30/76 26/77 24/78 28/79
diff --git a/src/main/resources/assets/orbsat/textures/blocks/metalDevice1_blast_furnace_preheater.png b/src/main/resources/assets/orbsat/textures/blocks/metalDevice1_blast_furnace_preheater.png
deleted file mode 100644
index 9bf0eb7..0000000
Binary files a/src/main/resources/assets/orbsat/textures/blocks/metalDevice1_blast_furnace_preheater.png and /dev/null differ
diff --git a/src/main/resources/assets/orbsat/textures/blocks/satellite_assembler.png b/src/main/resources/assets/orbsat/textures/blocks/satellite_assembler.png
new file mode 100644
index 0000000..bf5ea50
Binary files /dev/null and b/src/main/resources/assets/orbsat/textures/blocks/satellite_assembler.png differ