diff --git a/Nodes/Bin.tscn b/Nodes/Bin.tscn
index 74c2379..b59b9d6 100644
--- a/Nodes/Bin.tscn
+++ b/Nodes/Bin.tscn
@@ -4,18 +4,18 @@
 [ext_resource type="Script" path="res://scripts/Modules/Bin.gd" id="1_saxpo"]
 [ext_resource type="AudioStream" uid="uid://csenkrbfeeds7" path="res://Assets/Sounds/_SOUNDFX_/Muell.wav" id="3_lg545"]
 
-[sub_resource type="CylinderShape3D" id="CylinderShape3D_0suy8"]
-height = 3.84361
-radius = 1.33448
+[sub_resource type="BoxShape3D" id="BoxShape3D_cbvnb"]
 
 [node name="Bin" type="StaticBody3D"]
 script = ExtResource("1_saxpo")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-shape = SubResource("CylinderShape3D_0suy8")
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.447605, 0)
+shape = SubResource("BoxShape3D_cbvnb")
 
 [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("1_krl02")
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
diff --git a/Nodes/Player.tscn b/Nodes/Player.tscn
index f15061e..79a43d5 100644
--- a/Nodes/Player.tscn
+++ b/Nodes/Player.tscn
@@ -10,6 +10,7 @@ radius = 0.808068
 
 [node name="CharacterBody3D" type="CharacterBody3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 0)
+collision_layer = 2
 collision_mask = 3855
 script = ExtResource("1_dta8q")
 
diff --git a/Nodes/Train_P1.tscn b/Nodes/Train_P1.tscn
index 77e4d35..6d0404f 100644
--- a/Nodes/Train_P1.tscn
+++ b/Nodes/Train_P1.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=38 format=3 uid="uid://md2ofbviios3"]
+[gd_scene load_steps=41 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"]
@@ -29,6 +29,7 @@
 [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"]
+[ext_resource type="PackedScene" uid="uid://dtur8jn3vpeuv" path="res://Assets/Model/Objects/Trashcan.glb" id="30_1bsq2"]
 
 [sub_resource type="SpriteFrames" id="SpriteFrames_6p0y6"]
 animations = [{
@@ -114,6 +115,12 @@ size = Vector3(1.39165, 1, 4.34092)
 [sub_resource type="BoxShape3D" id="BoxShape3D_bmsh4"]
 size = Vector3(2, 1, 2)
 
+[sub_resource type="BoxShape3D" id="BoxShape3D_cedqu"]
+size = Vector3(1.83216, 2.38974, 1.62541)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_enmqk"]
+size = Vector3(1.6991, 2.76277, 1)
+
 [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")
@@ -129,16 +136,16 @@ 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.73547, -0.00526038, -4.92544)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.39134, -0.00526038, -5.05116)
 icon = ExtResource("14_503dh")
 
 [node name="Storage4" parent="." instance=ExtResource("4_5jw5g")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.77068, 0.0193441, -2.5302)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.18833, 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.9219, 0.0193443, 2.49114)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.66853, 0.0193443, 2.28094)
 currentType = 4
 icon = ExtResource("19_crlxr")
 
@@ -157,7 +164,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.02311, 1.2303, 5.94791)
 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)
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 2.887, -0.0309173, 10.6156)
 
 [node name="Storage3" parent="." instance=ExtResource("4_5jw5g")]
 transform = Transform3D(0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107, 4.16754, -0.348943, -10.4205)
@@ -172,20 +179,24 @@ transform = Transform3D(-6.55671e-08, 0, 1.5, 0, 1.5, 0, -1.5, 0, -6.55671e-08,
 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)
+transform = Transform3D(-0.697233, 0, -0.976656, 0, 1.2, 0, 0.976656, 0, -0.697233, 4.37438, -0.197263, -5.41223)
 
 [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)
+transform = Transform3D(0.899661, 0, 0.0247048, 0, 0.9, 0, -0.0247048, 0, 0.899661, 7.73652, -0.112241, -5.46297)
 
 [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)
+transform = Transform3D(0.599573, 0, -0.0226459, 0, 0.6, 0, 0.0226459, 0, 0.599573, 9.36594, -0.112241, -5.44506)
 
 [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="Trashcan" parent="train" instance=ExtResource("30_1bsq2")]
+transform = Transform3D(-2.91409e-08, 0, -0.666667, 0, 0.666667, 0, 0.666667, 0, -2.91409e-08, -1.0159, 0.0225529, 0.914305)
+
 [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
+collision_layer = 4
+collision_mask = 2
 
 [node name="CollisionShape3D2" type="CollisionShape3D" parent="train/StaticBody3D2"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.5, 2, 4.23516e-22)
@@ -216,9 +227,17 @@ 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)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.12602, 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)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.89027, 0.82649, 2.22244)
 shape = SubResource("BoxShape3D_bmsh4")
+
+[node name="CollisionShape3D10" type="CollisionShape3D" parent="train/StaticBody3D2"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.53467, 1.22896, 10.6981)
+shape = SubResource("BoxShape3D_cedqu")
+
+[node name="CollisionShape3D11" type="CollisionShape3D" parent="train/StaticBody3D2"]
+transform = Transform3D(0.712443, 0, -0.70173, 0, 1, 0, 0.70173, 0, 0.712443, 3.79233, 1.464, -10.9914)
+shape = SubResource("BoxShape3D_enmqk")
diff --git a/Nodes/Train_P2.tscn b/Nodes/Train_P2.tscn
index 959b2bb..cf6169e 100644
--- a/Nodes/Train_P2.tscn
+++ b/Nodes/Train_P2.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=31 format=3 uid="uid://bikdn7ep2vpxw"]
+[gd_scene load_steps=41 format=3 uid="uid://bikdn7ep2vpxw"]
 
 [ext_resource type="Script" path="res://scripts/Train.gd" id="1_mcmgl"]
 [ext_resource type="PackedScene" uid="uid://c1mymb38wqdg6" path="res://Nodes/train.tscn" id="2_xoa1a"]
@@ -25,18 +25,12 @@
 [ext_resource type="Texture2D" uid="uid://bhmyyu0uhx541" path="res://Assets/Textures/Opera_senza_titolo (2).png" id="18_flxwh"]
 [ext_resource type="Texture2D" uid="uid://cet5o7wla1x7t" path="res://Assets/Textures/Opera_senza_titolo.png" id="19_msksj"]
 [ext_resource type="Texture2D" uid="uid://biyvvql2ufkdf" path="res://Assets/Textures/Opera_senza_titolo (1).png" id="20_yp8lr"]
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_dijw3"]
-size = Vector3(1, 3.77669, 24)
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_ao4pd"]
-size = Vector3(12, 1, 24)
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_g76js"]
-size = Vector3(12, 4, 1)
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_psmwd"]
-size = Vector3(1, 6, 9.05915)
+[ext_resource type="Texture2D" uid="uid://5nu7hitxgm2p" path="res://Assets/Textures/Opera_senza_titolo (3).png" id="24_dbf0g"]
+[ext_resource type="Texture2D" uid="uid://cpb1ashccd2ki" path="res://Assets/Textures/Opera_senza_titolo (4).png" id="25_a3u45"]
+[ext_resource type="PackedScene" uid="uid://c06gvrsynr7p7" path="res://Assets/Model/Objects/GunpowerBarrel.glb" id="26_x4cx5"]
+[ext_resource type="PackedScene" uid="uid://dhev2lm3feo0q" path="res://Assets/Model/Objects/AmmoPile.glb" id="27_xdgc0"]
+[ext_resource type="PackedScene" uid="uid://rpsw0254tsue" path="res://Assets/Model/Modules/Coal.glb" id="28_11itx"]
+[ext_resource type="PackedScene" uid="uid://dtur8jn3vpeuv" path="res://Assets/Model/Objects/Trashcan.glb" id="29_mo2mr"]
 
 [sub_resource type="SpriteFrames" id="SpriteFrames_ltjyh"]
 animations = [{
@@ -101,41 +95,34 @@ animations = [{
 "speed": 2.0
 }]
 
+[sub_resource type="BoxShape3D" id="BoxShape3D_10501"]
+size = Vector3(1, 3.77669, 24)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_l5dyn"]
+size = Vector3(12, 1, 24)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_j0lf8"]
+size = Vector3(12, 4, 1)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_u61rg"]
+size = Vector3(1, 6, 9.05915)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_wg0bo"]
+size = Vector3(2.32375, 2.15267, 2.05962)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_3e2m4"]
+size = Vector3(1.39165, 1, 4.34092)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_tqsqw"]
+size = Vector3(2, 1, 2)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_euqoo"]
+size = Vector3(1.83216, 2.38974, 1.62541)
+
 [node name="Train2" type="Node3D"]
 transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 0, 0, 0)
 script = ExtResource("1_mcmgl")
 
-[node name="train" parent="." instance=ExtResource("2_xoa1a")]
-transform = Transform3D(1.96701e-07, 0, -1.5, 0, 1.5, 0, 1.5, 0, 1.96701e-07, -3, 0, -9)
-
-[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
-
-[node name="CollisionShape3D2" type="CollisionShape3D" parent="train/StaticBody3D2"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.5, 2, 4.23516e-22)
-shape = SubResource("BoxShape3D_dijw3")
-
-[node name="CollisionShape3D3" type="CollisionShape3D" parent="train/StaticBody3D2"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.5, 2, 3.55271e-15)
-shape = SubResource("BoxShape3D_dijw3")
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="train/StaticBody3D2"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, -3.55271e-15)
-shape = SubResource("BoxShape3D_ao4pd")
-
-[node name="CollisionShape3D4" type="CollisionShape3D" parent="train/StaticBody3D2"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 2, -12)
-shape = SubResource("BoxShape3D_g76js")
-
-[node name="CollisionShape3D5" type="CollisionShape3D" parent="train/StaticBody3D2"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 2, 12)
-shape = SubResource("BoxShape3D_g76js")
-
-[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_psmwd")
-
 [node name="CharacterBody3D" parent="." instance=ExtResource("3_x8j45")]
 transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 2.84217e-14, 3, -8)
 
@@ -146,29 +133,105 @@ animation = &"walking_giant"
 speed_scale = 2.0
 playing = true
 
-[node name="Bin" parent="." instance=ExtResource("14_n2rwc")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.18577, 0.622175, 10.6544)
-
-[node name="Cannon" parent="." instance=ExtResource("15_sof53")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.90697, 1.80346, 0.245877)
-
-[node name="Cannon2" parent="." instance=ExtResource("15_sof53")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.90697, 1.80346, -5.83086)
-
 [node name="Storage" parent="." instance=ExtResource("16_7dojn")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.30738, 0.293261, -10.1586)
+transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, 8.74228e-08, 0, 1, 5.64815, -0.00526038, -5.48825)
 icon = ExtResource("18_flxwh")
 
-[node name="Storage2" parent="." instance=ExtResource("16_7dojn")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.67656, 0.293261, -1.79235)
-currentType = 1
-icon = ExtResource("20_yp8lr")
+[node name="Storage4" parent="." instance=ExtResource("16_7dojn")]
+transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, 8.74228e-08, 0, 1, 5.50111, 0.0193441, -2.68954)
+currentType = 3
+icon = ExtResource("24_dbf0g")
 
-[node name="Storage3" parent="." instance=ExtResource("16_7dojn")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.79878, 0.293261, 6.13508)
+[node name="Storage5" parent="." instance=ExtResource("16_7dojn")]
+transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, 8.74228e-08, 0, 1, 4.91551, 0.0193443, 1.93591)
+currentType = 4
+icon = ExtResource("25_a3u45")
+
+[node name="Storage2" parent="." instance=ExtResource("16_7dojn")]
+transform = Transform3D(-0.248791, 0, -0.968557, 0, 1, 0, -0.968557, 0, 0.248791, 4.83957, 0.511235, 9.06418)
 currentType = 2
 icon = ExtResource("19_msksj")
-audioClip = ExtResource("17_xnc4h")
+
+[node name="Cannon" parent="." instance=ExtResource("15_sof53")]
+transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, 8.74228e-08, 0, 1, -3.96857, 1.2303, 0.0455484)
+
+[node name="Cannon2" parent="." instance=ExtResource("15_sof53")]
+transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, 8.74228e-08, 0, 1, -4.02311, 1.2303, 5.94791)
 
 [node name="Engine" parent="." instance=ExtResource("17_regf7")]
-transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 2.86451, 1.17834, 10.1923)
+transform = Transform3D(-6.55671e-08, 0, -1.5, 0, 1.5, 0, -1.5, 0, 6.55671e-08, 4.92586, 1.1688, -9.70376)
+
+[node name="Bin" parent="." instance=ExtResource("14_n2rwc")]
+transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, -1, 0, 4.37114e-08, -1.887, -0.0309173, 10.6156)
+
+[node name="Storage3" parent="." instance=ExtResource("16_7dojn")]
+transform = Transform3D(-0.707107, 0, -0.707107, 0, 1, 0, -0.707107, 0, 0.707107, -3.16754, -0.348943, -10.4205)
+currentType = 1
+icon = ExtResource("20_yp8lr")
+audioClip = ExtResource("17_xnc4h")
+
+[node name="train2" parent="." instance=ExtResource("2_xoa1a")]
+transform = Transform3D(-6.55671e-08, 0, -1.5, 0, 1.5, 0, -1.5, 0, 6.55671e-08, -2, 0, 9)
+
+[node name="GunpowerBarrel" parent="train2" instance=ExtResource("26_x4cx5")]
+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="train2" instance=ExtResource("27_xdgc0")]
+transform = Transform3D(1.1975, 0, -0.0774597, 0, 1.2, 0, 0.0774597, 0, 1.1975, 4.71655, -0.185855, -5.55393)
+
+[node name="AmmoPile2" parent="train2" instance=ExtResource("27_xdgc0")]
+transform = Transform3D(0.899069, 0, -0.0409208, 0, 0.9, 0, 0.0409208, 0, 0.899069, 7.74093, -0.112242, -5.57154)
+
+[node name="AmmoPile3" parent="train2" instance=ExtResource("27_xdgc0")]
+transform = Transform3D(0.599884, 0, -0.0117907, 0, 0.6, 0, 0.0117907, 0, 0.599884, 9.75146, -0.112241, -5.48505)
+
+[node name="Coal" parent="train2" instance=ExtResource("28_11itx")]
+transform = Transform3D(1.05948, 0, 1.69632, 0, 2, 0, -1.69632, 0, 1.05948, -0.739029, -0.113741, -4.45696)
+
+[node name="Trashcan" parent="train2" instance=ExtResource("29_mo2mr")]
+transform = Transform3D(-2.91409e-08, 0, -0.666667, 0, 0.666667, 0, 0.666667, 0, -2.91409e-08, -1.0159, 0.0225529, 0.914305)
+
+[node name="StaticBody3D2" type="StaticBody3D" parent="train2"]
+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 = 4
+collision_mask = 2
+
+[node name="CollisionShape3D2" type="CollisionShape3D" parent="train2/StaticBody3D2"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.5, 2, 4.23516e-22)
+shape = SubResource("BoxShape3D_10501")
+
+[node name="CollisionShape3D3" type="CollisionShape3D" parent="train2/StaticBody3D2"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.5, 2, 3.55271e-15)
+shape = SubResource("BoxShape3D_10501")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="train2/StaticBody3D2"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, 1.35525e-17)
+shape = SubResource("BoxShape3D_l5dyn")
+
+[node name="CollisionShape3D4" type="CollisionShape3D" parent="train2/StaticBody3D2"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 2, -12)
+shape = SubResource("BoxShape3D_j0lf8")
+
+[node name="CollisionShape3D5" type="CollisionShape3D" parent="train2/StaticBody3D2"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 2, 12)
+shape = SubResource("BoxShape3D_j0lf8")
+
+[node name="CollisionShape3D6" type="CollisionShape3D" parent="train2/StaticBody3D2"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 3, -1.52864)
+shape = SubResource("BoxShape3D_u61rg")
+
+[node name="CollisionShape3D7" type="CollisionShape3D" parent="train2/StaticBody3D2"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.87326, 0.400702, 10.5268)
+shape = SubResource("BoxShape3D_wg0bo")
+
+[node name="CollisionShape3D8" type="CollisionShape3D" parent="train2/StaticBody3D2"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.11988, 0.994293, -3.46126)
+shape = SubResource("BoxShape3D_3e2m4")
+
+[node name="CollisionShape3D9" type="CollisionShape3D" parent="train2/StaticBody3D2"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.10512, 0.82649, 2.0371)
+shape = SubResource("BoxShape3D_tqsqw")
+
+[node name="CollisionShape3D10" type="CollisionShape3D" parent="train2/StaticBody3D2"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.53467, 1.22896, 10.6981)
+shape = SubResource("BoxShape3D_euqoo")
diff --git a/Nodes/game.tscn b/Nodes/game.tscn
index 138c80d..58646a3 100644
--- a/Nodes/game.tscn
+++ b/Nodes/game.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=14 format=3 uid="uid://b8u4bo4mklj55"]
 
 [ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_dubwq"]
-[ext_resource type="PackedScene" path="res://Nodes/light_setup.tscn" id="2_1lh4t"]
+[ext_resource type="PackedScene" uid="uid://nxapkgcq2c70" path="res://Nodes/light_setup.tscn" id="2_1lh4t"]
 [ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="3_xcgy2"]
 [ext_resource type="PackedScene" uid="uid://md2ofbviios3" path="res://Nodes/Train_P1.tscn" id="4_gg4ea"]
 [ext_resource type="PackedScene" uid="uid://bikdn7ep2vpxw" path="res://Nodes/Train_P2.tscn" id="5_wi6pu"]
@@ -38,10 +38,10 @@ size = 32.0
 near = 0.041
 
 [node name="Train1" parent="." instance=ExtResource("4_gg4ea")]
-transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, -11, 0, 0)
+transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, -12, 0, 0)
 
 [node name="Train2" parent="." instance=ExtResource("5_wi6pu")]
-transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 10.9011, -0.0549407, -0.085681)
+transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 11, 0, 0)
 
 [node name="Control" parent="." instance=ExtResource("6_eicse")]
 
diff --git a/Nodes/light_setup.tscn b/Nodes/light_setup.tscn
index 88c0305..47194a5 100644
--- a/Nodes/light_setup.tscn
+++ b/Nodes/light_setup.tscn
@@ -24,7 +24,6 @@ ssil_enabled = true
 
 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
 transform = Transform3D(0.722372, -0.152892, 0.674391, -0.260844, 0.842959, 0.470511, -0.640421, -0.515795, 0.569048, 0, 8.25958, 0)
-shadow_enabled = true
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource("Environment_t4j8q")
diff --git a/Nodes/train.tscn b/Nodes/train.tscn
index 1c61c2c..908f080 100644
--- a/Nodes/train.tscn
+++ b/Nodes/train.tscn
@@ -40,8 +40,7 @@ mesh = SubResource("PlaneMesh_prxf6")
 transform = Transform3D(-0.00622939, 0.00716891, 0.116917, 0.00147208, 0.998129, -0.0611231, -0.250499, -0.0004462, -0.0133193, 0.767332, -3.17453, -0.645867)
 light_color = Color(0.968627, 0.466667, 0.380392, 1)
 light_energy = 40.0
-shadow_enabled = true
-spot_range = 7.84232
+spot_range = 7.0
 
 [node name="Floor" type="Node3D" parent="."]
 
diff --git a/Storage.tscn b/Storage.tscn
index 5d17575..db170a8 100644
--- a/Storage.tscn
+++ b/Storage.tscn
@@ -7,10 +7,10 @@
 size = Vector3(0.276038, 1, 0.598144)
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_orr2n"]
-radius = 3.22778
+radius = 1.56986
 
 [node name="Storage" type="StaticBody3D"]
-collision_layer = 2
+collision_mask = 2
 script = ExtResource("1_guwoh")
 currentType = 0
 
@@ -23,14 +23,15 @@ transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 2,
 visible = false
 texture = ExtResource("2_a5kei")
 
-[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
-volume_db = 2.0
-
 [node name="Area3D" type="Area3D" parent="."]
+collision_mask = 2
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
 shape = SubResource("CylinderShape3D_orr2n")
 
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+volume_db = 2.0
+
 [node name="Sprite3D2" type="Sprite3D" parent="."]
 transform = Transform3D(0.15, 0, 0, 0, -6.55671e-09, 0.15, 0, -0.15, -6.55671e-09, 0, 3.10039, 0)
 visible = false