diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java
index 3edad4671..46d66127d 100644
--- a/src/main/java/com/hbm/main/ClientProxy.java
+++ b/src/main/java/com/hbm/main/ClientProxy.java
@@ -71,6 +71,7 @@ import com.hbm.render.tileentity.*;
 import com.hbm.render.util.MissilePart;
 import com.hbm.sound.AudioWrapper;
 import com.hbm.sound.AudioWrapperClient;
+import com.hbm.sound.nt.ISoundSourceTE;
 import com.hbm.sound.nt.SoundWrapper;
 import com.hbm.sound.nt.SoundWrapperClient;
 import com.hbm.tileentity.TileEntityDoorGeneric;
@@ -1557,8 +1558,8 @@ public class ClientProxy extends ServerProxy {
 	}
 	
 	@Override
-	public SoundWrapper getTileSound(String sound) {
-		SoundWrapperClient wrapper = new SoundWrapperClient(sound);
+	public SoundWrapper getTileSound(String sound, ISoundSourceTE tile) {
+		SoundWrapperClient wrapper = new SoundWrapperClient(sound, tile);
 		return wrapper;
 	}
 
diff --git a/src/main/resources/assets/hbm/models/blocks/charge_c4.obj b/src/main/resources/assets/hbm/models/blocks/charge_c4.obj
index 2c7440e73..328002295 100644
--- a/src/main/resources/assets/hbm/models/blocks/charge_c4.obj
+++ b/src/main/resources/assets/hbm/models/blocks/charge_c4.obj
@@ -9,101 +9,131 @@ v -0.250000 -0.187500 -0.250000
 v -0.250000 -0.187500 0.250000
 v 0.250000 -0.187500 -0.250000
 v 0.250000 -0.312500 -0.250000
-v -0.468750 -0.500000 0.468750
 v 0.468750 -0.250000 -0.468750
-v -0.031250 -0.500000 0.468750
 v 0.468750 -0.250000 0.468750
 v 0.031250 -0.250000 -0.468750
-v -0.468750 -0.500000 -0.468750
 v 0.031250 -0.250000 0.468750
-v -0.031250 -0.500000 -0.468750
 v 0.031250 -0.500000 0.468750
-v -0.031250 -0.250000 -0.468750
 v 0.468750 -0.500000 0.468750
+v 0.031250 -0.500000 -0.468750
+v 0.468750 -0.500000 -0.468750
+v -0.031250 -0.250000 -0.468750
+v -0.031250 -0.250000 0.468750
 v -0.468750 -0.250000 -0.468750
 v -0.468750 -0.250000 0.468750
-v 0.031250 -0.500000 -0.468750
-v -0.031250 -0.250000 0.468750
-v 0.468750 -0.500000 -0.468750
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
+v -0.468750 -0.500000 0.468750
+v -0.031250 -0.500000 0.468750
+v -0.468750 -0.500000 -0.468750
+v -0.031250 -0.500000 -0.468750
+vt -0.000000 -0.000000
+vt 0.937500 0.437500
+vt -0.000000 0.437500
+vt 0.937500 0.000000
+vt -0.000000 0.437500
+vt 0.000000 -0.000000
+vt 0.000000 0.437500
 vt 0.250000 0.875000
-vt 0.750000 0.375000
-vt 0.750000 0.875000
-vt 0.250000 0.375000
-vt 0.750000 0.875000
+vt 0.000000 0.875000
+vt 0.937500 0.187500
+vt -0.000000 0.437500
+vt -0.000000 0.187500
 vt 0.250000 0.875000
-vt 0.750000 0.250000
-vt 0.250000 0.375000
-vt 0.250000 0.250000
-vt 0.750000 0.250000
-vt 0.250000 0.375000
-vt 0.250000 0.250000
-vt 0.750000 0.250000
-vt 0.250000 0.250000
-vt 0.750000 0.250000
-vt 0.250000 0.375000
-vt 0.250000 0.250000
-vt 0.250000 0.375000
-vt 0.750000 0.375000
-vt 0.750000 0.375000
-vt 0.750000 0.375000
-vt 0.750000 0.375000
+vt 0.000000 0.875000
+vt 0.937500 0.187500
+vt -0.000000 0.437500
+vt -0.000000 0.187500
+vt -0.000000 -0.000000
+vt 0.937500 0.437500
+vt -0.000000 0.437500
+vt 0.937500 0.000000
+vt -0.000000 0.437500
+vt 0.000000 -0.000000
+vt 0.000000 0.437500
+vt 0.250000 0.875000
+vt 0.000000 0.875000
+vt 0.937500 0.187500
+vt -0.000000 0.437500
+vt -0.000000 0.187500
+vt 0.250000 0.875000
+vt 0.000000 0.875000
+vt 0.937500 0.187500
+vt -0.000000 0.437500
+vt -0.000000 0.187500
+vt 0.937500 0.000000
+vt 0.937500 0.437500
+vt 0.250000 0.437500
+vt 0.937500 0.437500
+vt 0.250000 0.437500
+vt 0.937500 0.437500
+vt 0.937500 0.000000
+vt 0.937500 0.437500
+vt 0.250000 0.437500
+vt 0.937500 0.437500
+vt 0.250000 0.437500
+vt 0.937500 0.437500
+vt 0.375000 1.000000
+vt 0.875000 0.500000
+vt 0.875000 1.000000
+vt 0.375000 0.500000
+vt 0.875000 1.000000
+vt 0.375000 1.000000
+vt 1.000000 1.000000
+vt 0.875000 0.500000
+vt 1.000000 0.500000
+vt 1.000000 1.000000
+vt 0.875000 0.500000
+vt 1.000000 0.500000
+vt 1.000000 1.000000
+vt 0.875000 0.500000
+vt 1.000000 0.500000
+vt 1.000000 1.000000
+vt 0.875000 0.500000
+vt 1.000000 0.500000
+vt 0.375000 0.500000
+vt 0.875000 1.000000
+vt 0.875000 1.000000
+vt 0.875000 1.000000
 vn 0.0000 1.0000 0.0000
 vn 0.0000 -1.0000 -0.0000
 vn 0.0000 0.0000 -1.0000
-vn 0.0000 -0.0000 1.0000
 vn 1.0000 0.0000 0.0000
+vn 0.0000 -0.0000 1.0000
 vn -1.0000 0.0000 0.0000
 s off
-f 23/1/1 20/2/1 21/3/1
-f 12/4/1 13/5/1 15/6/1
-f 22/7/2 19/8/2 17/9/2
-f 14/10/2 11/11/2 9/12/2
-f 22/7/3 10/13/3 24/14/3
-f 23/1/4 9/12/4 11/11/4
-f 24/14/5 12/4/5 19/8/5
-f 20/2/3 16/15/3 14/10/3
-f 21/3/6 14/10/6 9/12/6
-f 18/16/5 11/11/5 16/15/5
-f 19/8/4 15/6/4 17/9/4
-f 17/9/6 13/5/6 22/7/6
-f 23/1/1 18/16/1 20/2/1
-f 12/4/1 10/13/1 13/5/1
-f 22/7/2 24/14/2 19/8/2
-f 14/10/2 16/15/2 11/11/2
-f 22/7/3 13/5/3 10/13/3
-f 23/1/4 21/3/4 9/12/4
-f 24/14/5 10/13/5 12/4/5
-f 20/2/3 18/16/3 16/15/3
-f 21/3/6 20/2/6 14/10/6
-f 18/16/5 23/1/5 11/11/5
-f 19/8/4 12/4/4 15/6/4
-f 17/9/6 15/6/6 13/5/6
+f 10/1/1 11/2/1 12/3/1
+f 15/4/2 14/5/2 13/6/2
+f 15/7/3 9/8/3 16/9/3
+f 16/10/4 10/11/4 14/12/4
+f 14/5/5 12/13/5 13/14/5
+f 13/15/6 11/16/6 15/17/6
+f 18/18/1 19/19/1 20/20/1
+f 23/21/2 22/22/2 21/23/2
+f 23/24/3 17/25/3 24/26/3
+f 24/27/4 18/28/4 22/29/4
+f 22/22/5 20/30/5 21/31/5
+f 21/32/6 19/33/6 23/34/6
+f 10/1/1 9/35/1 11/2/1
+f 15/4/2 16/36/2 14/5/2
+f 15/7/3 11/37/3 9/8/3
+f 16/10/4 9/38/4 10/11/4
+f 14/5/5 10/39/5 12/13/5
+f 13/15/6 12/40/6 11/16/6
+f 18/18/1 17/41/1 19/19/1
+f 23/21/2 24/42/2 22/22/2
+f 23/24/3 19/43/3 17/25/3
+f 24/27/4 17/44/4 18/28/4
+f 22/22/5 18/45/5 20/30/5
+f 21/32/6 20/46/6 19/33/6
 s 1
-f 1/17/2 2/18/2 3/19/2
-f 4/20/1 5/21/1 6/22/1
-f 1/23/3 7/24/3 8/25/3
-f 2/26/4 6/27/4 3/28/4
-f 8/29/5 4/20/5 2/30/5
-f 3/31/6 5/32/6 1/33/6
-f 1/17/2 8/34/2 2/18/2
-f 4/20/1 7/35/1 5/21/1
-f 1/23/3 5/36/3 7/24/3
-f 2/26/4 4/37/4 6/27/4
-f 8/29/5 7/35/5 4/20/5
-f 3/31/6 6/38/6 5/32/6
+f 1/47/2 2/48/2 3/49/2
+f 4/50/1 5/51/1 6/52/1
+f 1/53/3 7/54/3 8/55/3
+f 2/56/5 6/57/5 3/58/5
+f 8/59/4 4/60/4 2/61/4
+f 3/62/6 5/63/6 1/64/6
+f 1/47/2 8/65/2 2/48/2
+f 4/50/1 7/54/1 5/51/1
+f 1/53/3 5/51/3 7/54/3
+f 2/56/5 4/66/5 6/57/5
+f 8/59/4 7/67/4 4/60/4
+f 3/62/6 6/68/6 5/63/6
diff --git a/src/main/resources/assets/hbm/textures/blocks/charge_c4.png b/src/main/resources/assets/hbm/textures/blocks/charge_c4.png
index 9c947873f..bcb384034 100644
Binary files a/src/main/resources/assets/hbm/textures/blocks/charge_c4.png and b/src/main/resources/assets/hbm/textures/blocks/charge_c4.png differ
diff --git a/src/main/resources/assets/hbm/textures/blocks/charge_semtex.png b/src/main/resources/assets/hbm/textures/blocks/charge_semtex.png
index 7886c33d0..7fa884e88 100644
Binary files a/src/main/resources/assets/hbm/textures/blocks/charge_semtex.png and b/src/main/resources/assets/hbm/textures/blocks/charge_semtex.png differ