diff --git a/Nodes/Train_P1.tscn b/Nodes/Train_P1.tscn
index 35483f4..77e4d35 100644
--- a/Nodes/Train_P1.tscn
+++ b/Nodes/Train_P1.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=32 format=3 uid="uid://md2ofbviios3"]
+[gd_scene load_steps=38 format=3 uid="uid://md2ofbviios3"]
 
 [ext_resource type="Script" path="res://scripts/Train.gd" id="1_0x664"]
 [ext_resource type="PackedScene" uid="uid://bhivunrkj87cy" path="res://Nodes/engine.tscn" id="3_1ix85"]
@@ -26,6 +26,9 @@
 [ext_resource type="Texture2D" uid="uid://5nu7hitxgm2p" path="res://Assets/Textures/Opera_senza_titolo (3).png" id="18_xnvtr"]
 [ext_resource type="Texture2D" uid="uid://cet5o7wla1x7t" path="res://Assets/Textures/Opera_senza_titolo.png" id="19_5df2b"]
 [ext_resource type="Texture2D" uid="uid://cpb1ashccd2ki" path="res://Assets/Textures/Opera_senza_titolo (4).png" id="19_crlxr"]
+[ext_resource type="PackedScene" uid="uid://dhev2lm3feo0q" path="res://Assets/Model/Objects/AmmoPile.glb" id="27_s7kr6"]
+[ext_resource type="PackedScene" uid="uid://c06gvrsynr7p7" path="res://Assets/Model/Objects/GunpowerBarrel.glb" id="27_vnaiu"]
+[ext_resource type="PackedScene" uid="uid://rpsw0254tsue" path="res://Assets/Model/Modules/Coal.glb" id="28_4ee2i"]
 
 [sub_resource type="SpriteFrames" id="SpriteFrames_6p0y6"]
 animations = [{
@@ -102,6 +105,15 @@ size = Vector3(12, 4, 1)
 [sub_resource type="BoxShape3D" id="BoxShape3D_04j56"]
 size = Vector3(1, 6, 9.05915)
 
+[sub_resource type="BoxShape3D" id="BoxShape3D_1oq2b"]
+size = Vector3(2.32375, 2.15267, 2.05962)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_uhn7c"]
+size = Vector3(1.39165, 1, 4.34092)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_bmsh4"]
+size = Vector3(2, 1, 2)
+
 [node name="Train1" type="Node3D"]
 transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 0, 0, 0)
 script = ExtResource("1_0x664")
@@ -117,38 +129,38 @@ speed_scale = 2.0
 playing = true
 
 [node name="Storage" parent="." instance=ExtResource("4_5jw5g")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.41138, 0.0193443, -4.80548)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.73547, -0.00526038, -4.92544)
 icon = ExtResource("14_503dh")
 
 [node name="Storage4" parent="." instance=ExtResource("4_5jw5g")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.41138, 0.0193443, -0.805475)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.77068, 0.0193441, -2.5302)
 currentType = 3
 icon = ExtResource("18_xnvtr")
 
 [node name="Storage5" parent="." instance=ExtResource("4_5jw5g")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.41138, 0.0193443, 2.67569)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.9219, 0.0193443, 2.49114)
 currentType = 4
 icon = ExtResource("19_crlxr")
 
 [node name="Storage2" parent="." instance=ExtResource("4_5jw5g")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.92129, 0.0193453, -12.2529)
+transform = Transform3D(0.248791, 0, 0.968557, 0, 1, 0, -0.968557, 0, 0.248791, -3.83957, 0.511235, 9.06418)
 currentType = 2
 icon = ExtResource("19_5df2b")
 
 [node name="Cannon" parent="." instance=ExtResource("5_vgxqe")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.32927, 1.2303, 0.0486939)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.96857, 1.2303, 0.0455477)
 
 [node name="Cannon2" parent="." instance=ExtResource("5_vgxqe")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.38381, 1.2303, 5.95106)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.02311, 1.2303, 5.94791)
 
 [node name="Engine" parent="." instance=ExtResource("3_1ix85")]
-transform = Transform3D(-6.55671e-08, 0, 1.5, 0, 1.5, 0, -1.5, 0, -6.55671e-08, -4.44257, 1.1688, 10.8577)
+transform = Transform3D(-6.55671e-08, 0, 1.5, 0, 1.5, 0, -1.5, 0, -6.55671e-08, -3.92586, 1.1688, -9.70376)
 
 [node name="Bin" parent="." instance=ExtResource("16_q3kvk")]
 transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 4.66916, -0.287106, 10.1948)
 
 [node name="Storage3" parent="." instance=ExtResource("4_5jw5g")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.08816, -0.159192, -10.9498)
+transform = Transform3D(0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107, 4.16754, -0.348943, -10.4205)
 currentType = 1
 icon = ExtResource("15_dew1j")
 audioClip = ExtResource("17_ajifv")
@@ -156,6 +168,21 @@ audioClip = ExtResource("17_ajifv")
 [node name="train" parent="." instance=ExtResource("3_jmv6b")]
 transform = Transform3D(-6.55671e-08, 0, 1.5, 0, 1.5, 0, -1.5, 0, -6.55671e-08, 3, 0, 9)
 
+[node name="GunpowerBarrel" parent="train" instance=ExtResource("27_vnaiu")]
+transform = Transform3D(-6.55671e-08, 0, -1.5, 0, 1.5, 0, 1.5, 0, -6.55671e-08, 13.3432, 0.00133824, 1.23896)
+
+[node name="AmmoPile" parent="train" instance=ExtResource("27_s7kr6")]
+transform = Transform3D(1.19468, 0, 0.112826, 0, 1.2, 0, -0.112826, 0, 1.19468, 4.37438, -0.197263, -2.57364)
+
+[node name="AmmoPile2" parent="train" instance=ExtResource("27_s7kr6")]
+transform = Transform3D(0.753286, 0, 0.492504, 0, 0.9, 0, -0.492504, 0, 0.753286, 7.73652, -0.112241, -2.61592)
+
+[node name="AmmoPile3" parent="train" instance=ExtResource("27_s7kr6")]
+transform = Transform3D(0.753286, 0, 0.492504, 0, 0.9, 0, -0.492504, 0, 0.753286, 9.36594, -0.112241, -2.61592)
+
+[node name="Coal" parent="train" instance=ExtResource("28_4ee2i")]
+transform = Transform3D(1.05948, 0, 1.69632, 0, 2, 0, -1.69632, 0, 1.05948, -0.739029, -0.113741, -4.45696)
+
 [node name="StaticBody3D2" type="StaticBody3D" parent="train"]
 transform = Transform3D(-2.91409e-08, 0, -0.666667, 0, 0.666667, 0, 0.666667, 0, -2.91409e-08, 6, -0.137826, -1.33333)
 collision_layer = 2
@@ -183,3 +210,15 @@ shape = SubResource("BoxShape3D_d230q")
 [node name="CollisionShape3D6" type="CollisionShape3D" parent="train/StaticBody3D2"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 3, -1.52864)
 shape = SubResource("BoxShape3D_04j56")
+
+[node name="CollisionShape3D7" type="CollisionShape3D" parent="train/StaticBody3D2"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.87326, 0.400702, 10.5268)
+shape = SubResource("BoxShape3D_1oq2b")
+
+[node name="CollisionShape3D8" type="CollisionShape3D" parent="train/StaticBody3D2"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.11988, 0.994293, -3.46126)
+shape = SubResource("BoxShape3D_uhn7c")
+
+[node name="CollisionShape3D9" type="CollisionShape3D" parent="train/StaticBody3D2"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.1865, 0.82649, 2.40009)
+shape = SubResource("BoxShape3D_bmsh4")
diff --git a/Nodes/engine.tscn b/Nodes/engine.tscn
index ce30cff..d27e6d2 100644
--- a/Nodes/engine.tscn
+++ b/Nodes/engine.tscn
@@ -1,11 +1,10 @@
-[gd_scene load_steps=5 format=3 uid="uid://bhivunrkj87cy"]
+[gd_scene load_steps=4 format=3 uid="uid://bhivunrkj87cy"]
 
 [ext_resource type="Script" path="res://scripts/Modules/Engine.gd" id="1_8ew0t"]
 [ext_resource type="AudioStream" uid="uid://di3yqwqsn5v5s" path="res://Assets/Sounds/_SOUNDFX_/Kohle.wav" id="2_3jidn"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_qba77"]
-
-[sub_resource type="BoxMesh" id="BoxMesh_wu8t1"]
+size = Vector3(2.05561, 2.90146, 1.40367)
 
 [node name="Engine" type="StaticBody3D"]
 script = ExtResource("1_8ew0t")
@@ -14,8 +13,5 @@ script = ExtResource("1_8ew0t")
 transform = Transform3D(0.9, 0, 0, 0, 0.9, 0, 0, 0, 0.9, 0, 0, 0)
 shape = SubResource("BoxShape3D_qba77")
 
-[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
-mesh = SubResource("BoxMesh_wu8t1")
-
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
 stream = ExtResource("2_3jidn")
diff --git a/Nodes/train.tscn b/Nodes/train.tscn
index 1b82389..1c61c2c 100644
--- a/Nodes/train.tscn
+++ b/Nodes/train.tscn
@@ -1,11 +1,11 @@
 [gd_scene load_steps=22 format=3 uid="uid://c1mymb38wqdg6"]
 
-[ext_resource type="PackedScene" uid="uid://by5dkvik2ti0a" path="res://Assets/Model/Train/TrainFloorTile4x4.glb" id="1_ruoy4"]
+[ext_resource type="PackedScene" uid="uid://vpvpxwfpiao4" path="res://Assets/Model/Train/TrainFloorTile4x4.glb" id="1_ruoy4"]
 [ext_resource type="PackedScene" uid="uid://bbt38m8mno0d2" path="res://Assets/Model/Train/TrainWall.glb" id="2_ph0y0"]
 [ext_resource type="PackedScene" uid="uid://de8860yknve3i" path="res://Assets/Model/Train/TrainPillarFloorAdapter.glb" id="4_ub5ul"]
 [ext_resource type="PackedScene" uid="uid://dmraqtehsfo45" path="res://Assets/Model/Train/TrainWallArc.glb" id="5_lb36h"]
-[ext_resource type="PackedScene" uid="uid://cugtbjho4lj44" path="res://Assets/Model/Train/TrainFrameTopBottom.glb" id="6_0bbr0"]
-[ext_resource type="PackedScene" uid="uid://db7atd4d3px2c" path="res://Assets/Model/Train/TrainFrameTop.glb" id="7_2ua2q"]
+[ext_resource type="PackedScene" uid="uid://b7lntc0mh3g7q" path="res://Assets/Model/Train/TrainFrameTopBottom.glb" id="6_0bbr0"]
+[ext_resource type="PackedScene" uid="uid://50qugnp8dmhk" path="res://Assets/Model/Train/TrainFrameTop.glb" id="7_2ua2q"]
 [ext_resource type="PackedScene" uid="uid://gihk416gd7tx" path="res://Assets/Model/Train/TrainPillarArcExtention.glb" id="7_87n8g"]
 [ext_resource type="PackedScene" uid="uid://dfljj7kor8v2j" path="res://Assets/Model/Train/TrainPillarWood.glb" id="7_hd70v"]
 [ext_resource type="PackedScene" uid="uid://p7dpfo0na253" path="res://Assets/Model/Train/TrainWallInterior.glb" id="9_yvbc7"]
@@ -26,10 +26,10 @@
 [node name="train" type="Node3D"]
 
 [node name="Canon" parent="." instance=ExtResource("10_54n3n")]
-transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 6.14337, 0, 1.47043)
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 6.14337, 0, 2.47043)
 
 [node name="Canon2" parent="." instance=ExtResource("10_54n3n")]
-transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 2.07371, 0, 1.47043)
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 2.07371, 0, 2.47043)
 
 [node name="RoofShadowOccluder" type="MeshInstance3D" parent="."]
 transform = Transform3D(8.525, 0, 0, 0, 1, 0, 0, 0, 3.9864, 6, 4.07265, -2)
diff --git a/Storage.tscn b/Storage.tscn
index d87e6d0..5d17575 100644
--- a/Storage.tscn
+++ b/Storage.tscn
@@ -3,9 +3,8 @@
 [ext_resource type="Script" path="res://scripts/Modules/Storage.gd" id="1_guwoh"]
 [ext_resource type="Texture2D" uid="uid://cjc4wohtjb73j" path="res://Chest.png" id="2_a5kei"]
 
-[sub_resource type="CylinderShape3D" id="CylinderShape3D_c1ipa"]
-height = 3.60519
-radius = 1.33696
+[sub_resource type="BoxShape3D" id="BoxShape3D_xqnel"]
+size = Vector3(0.276038, 1, 0.598144)
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_orr2n"]
 radius = 3.22778
@@ -16,11 +15,12 @@ script = ExtResource("1_guwoh")
 currentType = 0
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1.10389, 0, 0, 0, 1, 0, 0, 0)
-shape = SubResource("CylinderShape3D_c1ipa")
+transform = Transform3D(2.5982, 0, 0, 0, 1.47652, 0, 0, 0, 2.0019, 0, 0, 0)
+shape = SubResource("BoxShape3D_xqnel")
 
 [node name="Sprite3D" type="Sprite3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 2, 0)
+visible = false
 texture = ExtResource("2_a5kei")
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
diff --git a/project.godot b/project.godot
index 16809a6..29ab7c6 100644
--- a/project.godot
+++ b/project.godot
@@ -29,7 +29,7 @@ _global_script_classes=[{
 "language": &"GDScript",
 "path": "res://scripts/Logic/MapNode.gd"
 }, {
-"base": "StaticBody3D",
+"base": "Node",
 "class": &"Module",
 "language": &"GDScript",
 "path": "res://scripts/Modules/Module.gd"