diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini
index 9553cde..3c7e69d 100644
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@@ -127,3 +127,7 @@ ApplicationScale=1.000000
 UIScaleRule=ShortestSide
 CustomScalingRuleClass=None
 UIScaleCurve=(EditorCurveData=(PreInfinityExtrap=RCCE_Constant,PostInfinityExtrap=RCCE_Constant,Keys=((Time=480.000000,Value=0.444000),(Time=720.000000,Value=0.666000),(Time=1080.000000,Value=1.000000),(Time=8640.000000,Value=8.000000)),DefaultValue=340282346638528859811704183484516925440.000000),ExternalCurve=None)
+
+[/Script/Engine.PhysicsSettings]
+bDisableCCD=True
+
diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini
index 38bd149..5f1168d 100644
--- a/Config/DefaultGame.ini
+++ b/Config/DefaultGame.ini
@@ -1,2 +1,6 @@
 [/Script/EngineSettings.GeneralProjectSettings]
 ProjectID=8D5D415B40759334D106D595ED276C8A
+
+[/Script/UnrealEd.ProjectPackagingSettings]
+FullRebuild=True
+
diff --git a/Content/Animation/Character/Arm-Right-Error_Skeleton_Sequence.uasset b/Content/Animation/Character/Arm-Right-Error_Skeleton_Sequence.uasset
deleted file mode 100644
index d416b22..0000000
--- a/Content/Animation/Character/Arm-Right-Error_Skeleton_Sequence.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:106c8850a4cffe7e2c52ab9271868f13456aa1165fd092f55bf67c461b36df9a
-size 56660
diff --git a/Content/Audio/MUS_Fight/FightMusic.uasset b/Content/Audio/MUS_Fight/FightMusic.uasset
deleted file mode 100644
index fc1270c..0000000
--- a/Content/Audio/MUS_Fight/FightMusic.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ea6168297ed1e59c3f973d5ca97158afb5c6f727d2b14de6dc37b2fe964236a8
-size 632
diff --git a/Content/Audio/MUS_Fight/Fight_Music.uasset b/Content/Audio/MUS_Fight/Fight_Music.uasset
index e35e674..c68be93 100644
--- a/Content/Audio/MUS_Fight/Fight_Music.uasset
+++ b/Content/Audio/MUS_Fight/Fight_Music.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1df72cc34d85da4788e9d5394b82ae4bfb904dda16208478e95d17050d008eb1
-size 14696
+oid sha256:98ca64cbbb28e14342aa72d6b97da35231b120915dd86035f9fbcb3ed4ce5df7
+size 14666
diff --git a/Content/Blueprints/BP_IntroDrone.uasset b/Content/Blueprints/BP_IntroDrone.uasset
index 4d70c0b..323c97a 100644
--- a/Content/Blueprints/BP_IntroDrone.uasset
+++ b/Content/Blueprints/BP_IntroDrone.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8d66851bf3c07072e6ff02d875b3268372b7692a61f02bce4e1aeb697601074
-size 144222
+oid sha256:17e84da44223a7aacd1407ca26e60eb5a4bf2b70e3f787f0eaf24471950b3be1
+size 144547
diff --git a/Content/Blueprints/BP_PlayerCharacter.uasset b/Content/Blueprints/BP_PlayerCharacter.uasset
index 676e568..973013a 100644
--- a/Content/Blueprints/BP_PlayerCharacter.uasset
+++ b/Content/Blueprints/BP_PlayerCharacter.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f92d781f39e77b10b468b964799d332ae2742eae4f6fb7f5d1372adaab2bfb3
-size 446009
+oid sha256:1f728da4d0e7bef906c8b2b8fbbb506ab15c7448b7811c5b6a385b356acfea5f
+size 444010
diff --git a/Content/Blueprints/BP_RailPod.uasset b/Content/Blueprints/BP_RailPod.uasset
index 610711c..40d6eb2 100644
--- a/Content/Blueprints/BP_RailPod.uasset
+++ b/Content/Blueprints/BP_RailPod.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77435b5b14743073b3c040c5076e668f8c0daf879cbbda2956a27cd3e5934a5d
-size 140820
+oid sha256:570ecf3555a4a7bbb57c892b325d60ac6ad70c5fa10800c09e9e2fb05cbb6573
+size 156228
diff --git a/Content/Blueprints/Blueprint_WallSconce.uasset b/Content/Blueprints/Blueprint_WallSconce.uasset
deleted file mode 100644
index 19a568f..0000000
--- a/Content/Blueprints/Blueprint_WallSconce.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4ad95867e9184157bfdd9c6db8febbb4031ed3e5c936455c18ee4d34db24488a
-size 123331
diff --git a/Content/Blueprints/Drone/DroneBP_2.uasset b/Content/Blueprints/Drone/DroneBP_2.uasset
index a58a4df..f0be77b 100644
--- a/Content/Blueprints/Drone/DroneBP_2.uasset
+++ b/Content/Blueprints/Drone/DroneBP_2.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f47f382de040f42a90626c78e9c3968a8b166e8edd44dd6f5686eeb97a7f8d0
-size 95514
+oid sha256:a55287a8edb7bf790e92ea0b234627cd4e692b2d75324c4d93acd4a4d451bed2
+size 95833
diff --git a/Content/Maps/CompleteMap.umap b/Content/Maps/CompleteMap.umap
deleted file mode 100644
index 151f469..0000000
--- a/Content/Maps/CompleteMap.umap
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:72194bb658453de1967e95b03f1bd6ef122aea64984f8f7933a1896639ed0be4
-size 201039791
diff --git a/Content/Maps/Intro.umap b/Content/Maps/Intro.umap
index 69271b6..851847c 100644
--- a/Content/Maps/Intro.umap
+++ b/Content/Maps/Intro.umap
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89e078ea924031567faefc83a12f0cd6bc6c933fce7e3de42b6e7a5ea74ceb31
-size 639759
+oid sha256:12eab03f6765eef8985a1d5275bb5537a10670b898c8dcd692a89e752a72d8e9
+size 637092
diff --git a/Content/Maps/Octogonia-main-map-living_2.uasset b/Content/Maps/Octogonia-main-map-living_2.uasset
deleted file mode 100644
index 2ca9ef4..0000000
--- a/Content/Maps/Octogonia-main-map-living_2.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:161cf14fff448b64cd9cdfd9aa3ddcfb4c820b4c82cee5799dd58501f2519d62
-size 536
diff --git a/Content/Maps/OptimizedMap.umap b/Content/Maps/OptimizedMap.umap
index 04b33bf..d26428c 100644
--- a/Content/Maps/OptimizedMap.umap
+++ b/Content/Maps/OptimizedMap.umap
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04fe7c60b863f73d67517a896cfc0ae0564457309b8ab222fd8105e3d31702f8
-size 13231168
+oid sha256:257041249d66efed361d3242d4b7d0998d753ad9ffc764d14e8addf1df40ffba
+size 9369247
diff --git a/Content/Meshes/Drone-2-Brutus_DM.uasset b/Content/Meshes/Drone-2-Brutus_DM.uasset
deleted file mode 100644
index 1810480..0000000
--- a/Content/Meshes/Drone-2-Brutus_DM.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:306a01f6203d4409bf62aa57abbced0c06afd2d3ae8670954f78fde1ce49b88b
-size 4285742
diff --git a/Content/Meshes/Drones/Drone-2-Brutus_DMv2.uasset b/Content/Meshes/Drones/Drone-2-Brutus_DMv2.uasset
new file mode 100644
index 0000000..24de77f
--- /dev/null
+++ b/Content/Meshes/Drones/Drone-2-Brutus_DMv2.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1648188db588bb6f21eac072cfa43b69e1e2e1e5ec5d4bb2d4c97bf1637a6d89
+size 4284762
diff --git a/Content/Meshes/Drones/Reactor.uasset b/Content/Meshes/Drones/Reactor.uasset
index 84b33c9..66f3550 100644
--- a/Content/Meshes/Drones/Reactor.uasset
+++ b/Content/Meshes/Drones/Reactor.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d4018bb82738dd544d42f284ca86ddd275ca2b814af004d7c3dc75ac4b63912
-size 265361
+oid sha256:6c6d92bda38b48262433225efbaf827a1575dac979632351887aadff79cbbef8
+size 265641
diff --git a/Content/Meshes/Fight_Music_-_Intro.uasset b/Content/Meshes/Fight_Music_-_Intro.uasset
deleted file mode 100644
index bda90e7..0000000
--- a/Content/Meshes/Fight_Music_-_Intro.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1fc890657e137fd8a218ef1ff0e6e3953f2961c2a53a58d7661f79bb932feeeb
-size 532
diff --git a/Content/Meshes/Hand.uasset b/Content/Meshes/Hand.uasset
deleted file mode 100644
index f379a1f..0000000
--- a/Content/Meshes/Hand.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f77d4c28112a0fdec84c303e655678255af734d18bb559b968518fd15f2ba9d8
-size 517
diff --git a/Content/Meshes/IntroCocoon/SM_IntroCocoon.uasset b/Content/Meshes/IntroCocoon/SM_IntroCocoon.uasset
new file mode 100644
index 0000000..ad5a73a
--- /dev/null
+++ b/Content/Meshes/IntroCocoon/SM_IntroCocoon.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ca42c34c53a91f190238a8d19852e880ecf5405d8534f3940f3699be83901a60
+size 457436
diff --git a/Content/Meshes/IntroCocoon/SM_IntroCocoon2.uasset b/Content/Meshes/IntroCocoon/SM_IntroCocoon2.uasset
new file mode 100644
index 0000000..93d2263
--- /dev/null
+++ b/Content/Meshes/IntroCocoon/SM_IntroCocoon2.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc6f74025fc1b67cfae23b0c88399a80334f96e10131f163c5888bdea9c3813b
+size 223296
diff --git a/Content/Meshes/IntroCocoon/SM_IntroCocoon3.uasset b/Content/Meshes/IntroCocoon/SM_IntroCocoon3.uasset
new file mode 100644
index 0000000..a57d53f
--- /dev/null
+++ b/Content/Meshes/IntroCocoon/SM_IntroCocoon3.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:44a3dc1d6358481af389b261bdf27a7c408d13f8f987a906fa0bfe52c37b756d
+size 340424
diff --git a/Content/Meshes/MERGED/M_M_SM_Environement.uasset b/Content/Meshes/MERGED/M_M_SM_Environement.uasset
new file mode 100644
index 0000000..0a74cbe
--- /dev/null
+++ b/Content/Meshes/MERGED/M_M_SM_Environement.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cf6be00d474bd1cdf5a514ffc72eafbb6b5b2cd040a3f06b10c69b36fa5d3472
+size 98168
diff --git a/Content/Meshes/MERGED/M_M_SM_MERGED_Boxi.uasset b/Content/Meshes/MERGED/M_M_SM_MERGED_Boxi.uasset
new file mode 100644
index 0000000..30c86c2
--- /dev/null
+++ b/Content/Meshes/MERGED/M_M_SM_MERGED_Boxi.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bf1aab439666f7d66a2dfbe15ac0836f9f8511db0ac221544bed37b81cc4b019
+size 88671
diff --git a/Content/Meshes/MERGED/M_M_SM_MERGED_Cylinder.uasset b/Content/Meshes/MERGED/M_M_SM_MERGED_Cylinder.uasset
new file mode 100644
index 0000000..6cc0320
--- /dev/null
+++ b/Content/Meshes/MERGED/M_M_SM_MERGED_Cylinder.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ec056caa812162bb612e6246fee4949a5e31835f72dff40f9877f9bb4aff9d4
+size 85414
diff --git a/Content/Meshes/MERGED/M_M_SM_MERGED_Hexagone.uasset b/Content/Meshes/MERGED/M_M_SM_MERGED_Hexagone.uasset
new file mode 100644
index 0000000..23026fd
--- /dev/null
+++ b/Content/Meshes/MERGED/M_M_SM_MERGED_Hexagone.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cae52befc761a169b4121465411cc526602fadf4e283b72c89ccce591418465e
+size 86535
diff --git a/Content/Meshes/MERGED/M_M_SM_MERGED_Moutain.uasset b/Content/Meshes/MERGED/M_M_SM_MERGED_Moutain.uasset
new file mode 100644
index 0000000..fdcc3a7
--- /dev/null
+++ b/Content/Meshes/MERGED/M_M_SM_MERGED_Moutain.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b722e19f574cffe33cd00a145fbd696597c5802390d3cd0b27ab7be343fbadf8
+size 94455
diff --git a/Content/Meshes/MERGED/M_M_SM_MERGED_Sphere.uasset b/Content/Meshes/MERGED/M_M_SM_MERGED_Sphere.uasset
new file mode 100644
index 0000000..a5034ea
--- /dev/null
+++ b/Content/Meshes/MERGED/M_M_SM_MERGED_Sphere.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:95ec35c751f273cb0b71591214da09f9c4069d9d0470e817217d49771c0c5300
+size 83295
diff --git a/Content/Meshes/MERGED/Playground.uasset b/Content/Meshes/MERGED/Playground.uasset
new file mode 100644
index 0000000..f9eb3cb
--- /dev/null
+++ b/Content/Meshes/MERGED/Playground.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a9d84d209f279438805fed65d267515b0682fbc49c500621e1126dacc8d1eea
+size 92242
diff --git a/Content/Meshes/MERGED/SM_Environement.uasset b/Content/Meshes/MERGED/SM_Environement.uasset
new file mode 100644
index 0000000..0d9a6bd
--- /dev/null
+++ b/Content/Meshes/MERGED/SM_Environement.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5950b08c3a1cd7969086ad152fa40b45686fdbec4eb7cbf29f5c793ef916ea0b
+size 92909103
diff --git a/Content/Meshes/MERGED/SM_MERGED_Boxi.uasset b/Content/Meshes/MERGED/SM_MERGED_Boxi.uasset
new file mode 100644
index 0000000..21500f3
--- /dev/null
+++ b/Content/Meshes/MERGED/SM_MERGED_Boxi.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd08de35822e4655773219977d9a13244b8777a31de81b157b606e46420c2030
+size 17183492
diff --git a/Content/Meshes/MERGED/SM_MERGED_Cylinder.uasset b/Content/Meshes/MERGED/SM_MERGED_Cylinder.uasset
new file mode 100644
index 0000000..7dfcad8
--- /dev/null
+++ b/Content/Meshes/MERGED/SM_MERGED_Cylinder.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6533e2deb5c647a306ed74bf304c5bd4b60822155a14806342e8f6ce165c2f54
+size 69432618
diff --git a/Content/Meshes/MERGED/SM_MERGED_Hexagone.uasset b/Content/Meshes/MERGED/SM_MERGED_Hexagone.uasset
new file mode 100644
index 0000000..b4b00a4
--- /dev/null
+++ b/Content/Meshes/MERGED/SM_MERGED_Hexagone.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:35dd9ae316ea722b98cf2208a8cfbecabcb08cf3fb0c3f57c99a55934d898478
+size 3282358
diff --git a/Content/Meshes/MERGED/SM_MERGED_Moutain.uasset b/Content/Meshes/MERGED/SM_MERGED_Moutain.uasset
new file mode 100644
index 0000000..068c13f
--- /dev/null
+++ b/Content/Meshes/MERGED/SM_MERGED_Moutain.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:699ba4ec6d94856f4918e5ffc79e489a5e6c76835e882fe5b20380c41fadc003
+size 5649375
diff --git a/Content/Meshes/MERGED/SM_MERGED_Sphere.uasset b/Content/Meshes/MERGED/SM_MERGED_Sphere.uasset
new file mode 100644
index 0000000..6136d8a
--- /dev/null
+++ b/Content/Meshes/MERGED/SM_MERGED_Sphere.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:35cdcd5484dc48ebc474671b58e95c61bbbe1695fa6f8ce47ee7440df29cfe31
+size 7588789
diff --git a/Content/Meshes/MERGED/Standardmaterial.uasset b/Content/Meshes/MERGED/Standardmaterial.uasset
new file mode 100644
index 0000000..ab7d9d0
--- /dev/null
+++ b/Content/Meshes/MERGED/Standardmaterial.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8a9766fb1cce56d20cc86ca763a137a1877b38f84c567921775818d56b9939a9
+size 80776
diff --git a/Content/Meshes/MERGED/T_M_SM_Environement_D.uasset b/Content/Meshes/MERGED/T_M_SM_Environement_D.uasset
new file mode 100644
index 0000000..604581e
--- /dev/null
+++ b/Content/Meshes/MERGED/T_M_SM_Environement_D.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c418914da9da8f7922f73e09673f7d4e53da6861be4cbb20d108a03a805db09e
+size 4954
diff --git a/Content/Meshes/MERGED/T_M_SM_Environement_N.uasset b/Content/Meshes/MERGED/T_M_SM_Environement_N.uasset
new file mode 100644
index 0000000..aa71df0
--- /dev/null
+++ b/Content/Meshes/MERGED/T_M_SM_Environement_N.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:32a6b59ca96910cd64d86452216e71764a67f5f3537a005c9f13b4781bd00ef5
+size 213007
diff --git a/Content/Meshes/MERGED/T_M_SM_MERGED_Boxi_D.uasset b/Content/Meshes/MERGED/T_M_SM_MERGED_Boxi_D.uasset
new file mode 100644
index 0000000..d289b84
--- /dev/null
+++ b/Content/Meshes/MERGED/T_M_SM_MERGED_Boxi_D.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e04a03a7c52fcc36d022cb5bc736d3cd5db4e9c1f680400efed6fa93a175544f
+size 4788
diff --git a/Content/Meshes/MERGED/T_M_SM_MERGED_Boxi_N.uasset b/Content/Meshes/MERGED/T_M_SM_MERGED_Boxi_N.uasset
new file mode 100644
index 0000000..599a205
--- /dev/null
+++ b/Content/Meshes/MERGED/T_M_SM_MERGED_Boxi_N.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dfb75248363c74adcf52234710c03cafa7ea9e4fbc322c32dfb85cb8cd5645bf
+size 4752
diff --git a/Content/Meshes/MERGED/T_M_SM_MERGED_Cylinder_D.uasset b/Content/Meshes/MERGED/T_M_SM_MERGED_Cylinder_D.uasset
new file mode 100644
index 0000000..b0c9d65
--- /dev/null
+++ b/Content/Meshes/MERGED/T_M_SM_MERGED_Cylinder_D.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0da0525a43b3ade87db3fea17cc1200fdec7593d610cbb5182ce34affe97c6fe
+size 4420
diff --git a/Content/Meshes/MERGED/T_M_SM_MERGED_Cylinder_N.uasset b/Content/Meshes/MERGED/T_M_SM_MERGED_Cylinder_N.uasset
new file mode 100644
index 0000000..7afee95
--- /dev/null
+++ b/Content/Meshes/MERGED/T_M_SM_MERGED_Cylinder_N.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31073dd4aa4be43ec2825bcf2ab111639e2097c49511e422ac34b55c28a066ee
+size 4705
diff --git a/Content/Meshes/MERGED/T_M_SM_MERGED_Hexagone_D.uasset b/Content/Meshes/MERGED/T_M_SM_MERGED_Hexagone_D.uasset
new file mode 100644
index 0000000..be46ba8
--- /dev/null
+++ b/Content/Meshes/MERGED/T_M_SM_MERGED_Hexagone_D.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc94d1a3b13958aabdc06cfad6dac59c2eb99d7acc08319b9cdd1bc26c985f05
+size 4425
diff --git a/Content/Meshes/MERGED/T_M_SM_MERGED_Hexagone_N.uasset b/Content/Meshes/MERGED/T_M_SM_MERGED_Hexagone_N.uasset
new file mode 100644
index 0000000..11d7457
--- /dev/null
+++ b/Content/Meshes/MERGED/T_M_SM_MERGED_Hexagone_N.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8878bbb4b92728fdd862a523c4f1412b9d32e24e42c2612b620640a1852fd994
+size 4705
diff --git a/Content/Meshes/MERGED/T_M_SM_MERGED_Moutain_D.uasset b/Content/Meshes/MERGED/T_M_SM_MERGED_Moutain_D.uasset
new file mode 100644
index 0000000..0b106a7
--- /dev/null
+++ b/Content/Meshes/MERGED/T_M_SM_MERGED_Moutain_D.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c02ecdf40bba5d62c3f69a03726e9f8c03c6ae1ffd7963384f891e61bfb45209
+size 4769
diff --git a/Content/Meshes/MERGED/T_M_SM_MERGED_Moutain_N.uasset b/Content/Meshes/MERGED/T_M_SM_MERGED_Moutain_N.uasset
new file mode 100644
index 0000000..16c20de
--- /dev/null
+++ b/Content/Meshes/MERGED/T_M_SM_MERGED_Moutain_N.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac39b7be9ca54edd6614c54e498e82d37ab514fa5f8105003569a6eee1830f5e
+size 459270
diff --git a/Content/Meshes/MERGED/T_M_SM_MERGED_Sphere_D.uasset b/Content/Meshes/MERGED/T_M_SM_MERGED_Sphere_D.uasset
new file mode 100644
index 0000000..5583954
--- /dev/null
+++ b/Content/Meshes/MERGED/T_M_SM_MERGED_Sphere_D.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:513956e6f0d553027f7b9982f43d15ed3f581d0faf05652ec6adf6397e6bd8e2
+size 4415
diff --git a/Content/Meshes/MERGED/T_M_SM_MERGED_Sphere_N.uasset b/Content/Meshes/MERGED/T_M_SM_MERGED_Sphere_N.uasset
new file mode 100644
index 0000000..6b218f5
--- /dev/null
+++ b/Content/Meshes/MERGED/T_M_SM_MERGED_Sphere_N.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b931a1722e1b26df25943214955ef219eb00c5c7435a96c4067c2b14d0405863
+size 434173
diff --git a/Content/Meshes/M_SM_Environement.uasset b/Content/Meshes/M_SM_Environement.uasset
deleted file mode 100644
index 74726d2..0000000
--- a/Content/Meshes/M_SM_Environement.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:564cfb8aca8f84cb294e9dad087d68faf2876f058045269616f8c855086df8cd
-size 348659
diff --git a/Content/Meshes/M_SM_MERGED_Boxi.uasset b/Content/Meshes/M_SM_MERGED_Boxi.uasset
deleted file mode 100644
index d6028c9..0000000
--- a/Content/Meshes/M_SM_MERGED_Boxi.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:16582733474bd5b022608d22d3c503c06596cdb4bddcac27c85287306fc522bc
-size 138754
diff --git a/Content/Meshes/M_SM_MERGED_Cylinder.uasset b/Content/Meshes/M_SM_MERGED_Cylinder.uasset
deleted file mode 100644
index a7252d0..0000000
--- a/Content/Meshes/M_SM_MERGED_Cylinder.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:02c7bfbc6df6161eee1d26ab641372ad9cb71cacc11c6395e744fd4d9797893d
-size 135395
diff --git a/Content/Meshes/M_SM_MERGED_Hexagone.uasset b/Content/Meshes/M_SM_MERGED_Hexagone.uasset
deleted file mode 100644
index ca08538..0000000
--- a/Content/Meshes/M_SM_MERGED_Hexagone.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ad147529f05281c6aa73837813639a52fd91ae2132a620be7bfe7f25645b0a93
-size 136993
diff --git a/Content/Meshes/M_SM_MERGED_Moutain.uasset b/Content/Meshes/M_SM_MERGED_Moutain.uasset
deleted file mode 100644
index 4802f68..0000000
--- a/Content/Meshes/M_SM_MERGED_Moutain.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e407f93419be22e20ad82195587698204f1b9ee0346fb4d022c4621e29047251
-size 584576
diff --git a/Content/Meshes/M_SM_MERGED_Sphere.uasset b/Content/Meshes/M_SM_MERGED_Sphere.uasset
deleted file mode 100644
index 7502ae8..0000000
--- a/Content/Meshes/M_SM_MERGED_Sphere.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cdd72ec64870cd909ed2eb363f28fb86dd6151ba41bbae3b69eb7c9ac7a16d35
-size 541729
diff --git a/Content/Meshes/Playground.uasset b/Content/Meshes/Playground.uasset
deleted file mode 100644
index 9efbf03..0000000
--- a/Content/Meshes/Playground.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:936e83348e993229b0e19b49932ec114d787a5efaae02f2c4685117b0469955c
-size 81629
diff --git a/Content/Meshes/RAIL-tillable.uasset b/Content/Meshes/RAIL-tillable.uasset
deleted file mode 100644
index ce1b6a8..0000000
--- a/Content/Meshes/RAIL-tillable.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c54843b8d0e8b2964cb4f34d3ba2b52fee3cc49805b3637efb774134e3514ae7
-size 1023
diff --git a/Content/Meshes/SM_Environement.uasset b/Content/Meshes/SM_Environement.uasset
deleted file mode 100644
index 737afc8..0000000
--- a/Content/Meshes/SM_Environement.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:527463462114f3c13d6bd79c68412cde6c4f273da8309d1eeeccace6e1c0b652
-size 92909616
diff --git a/Content/Meshes/SM_IntroCocoon.uasset b/Content/Meshes/SM_IntroCocoon.uasset
deleted file mode 100644
index 64ff71c..0000000
--- a/Content/Meshes/SM_IntroCocoon.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aa760e5921c7eb5e54d40a61168c7c5d4697ed7fc07d9dc3508974b007060068
-size 443781
diff --git a/Content/Meshes/SM_IntroCocoon2.uasset b/Content/Meshes/SM_IntroCocoon2.uasset
deleted file mode 100644
index 7cc36f8..0000000
--- a/Content/Meshes/SM_IntroCocoon2.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e525d7491b33b97e23295b628fa7e06e160eda73ec359a810974ed3f7779029
-size 208586
diff --git a/Content/Meshes/SM_IntroCocoon3.uasset b/Content/Meshes/SM_IntroCocoon3.uasset
deleted file mode 100644
index 61f1a60..0000000
--- a/Content/Meshes/SM_IntroCocoon3.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:79cc0ee9bb40614fc841a99b306502a82c1ca8ae78c358a49e183a0e0ca9abb0
-size 325821
diff --git a/Content/Meshes/SM_MERGED_Boxi.uasset b/Content/Meshes/SM_MERGED_Boxi.uasset
deleted file mode 100644
index 21cf675..0000000
--- a/Content/Meshes/SM_MERGED_Boxi.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:82cbd2af59211692ee03ba18293665b508596fc17d2181eff1b148e8a72bf7ad
-size 17183212
diff --git a/Content/Meshes/SM_MERGED_Cylinder.uasset b/Content/Meshes/SM_MERGED_Cylinder.uasset
deleted file mode 100644
index 7de3b30..0000000
--- a/Content/Meshes/SM_MERGED_Cylinder.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aeb43388ae31694fb904e566a98894d5aa9d34eff624d3cbd695f4f5fde0e180
-size 69432520
diff --git a/Content/Meshes/SM_MERGED_Hexagone.uasset b/Content/Meshes/SM_MERGED_Hexagone.uasset
deleted file mode 100644
index a176487..0000000
--- a/Content/Meshes/SM_MERGED_Hexagone.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f2127d17175854a174cac9d0a7b2f0ebef87785b08fa2963fb785f3808400f4
-size 3281962
diff --git a/Content/Meshes/SM_MERGED_Moutain.uasset b/Content/Meshes/SM_MERGED_Moutain.uasset
deleted file mode 100644
index 4ce2648..0000000
--- a/Content/Meshes/SM_MERGED_Moutain.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b41b82461bb2fcc4702152ff08ee2651a3ee90bd2b200a83a27105547d498760
-size 5648915
diff --git a/Content/Meshes/SM_MERGED_Sphere.uasset b/Content/Meshes/SM_MERGED_Sphere.uasset
deleted file mode 100644
index 32bc9c5..0000000
--- a/Content/Meshes/SM_MERGED_Sphere.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8db6222f5999a11d51ca62093d47889798edfc65b60dc29547b4d2a828d4b535
-size 7588841
diff --git a/Content/Meshes/SM_RailTemplate.uasset b/Content/Meshes/SM_RailTemplate.uasset
deleted file mode 100644
index b7664e7..0000000
--- a/Content/Meshes/SM_RailTemplate.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:68010fb0bdfdb9698f9af8bf0ecca4449d4977c3244b1249fc9fa8453ace01d3
-size 1033
diff --git a/Content/Meshes/Standardmaterial.uasset b/Content/Meshes/Standardmaterial.uasset
deleted file mode 100644
index 9693d4b..0000000
--- a/Content/Meshes/Standardmaterial.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e7c8248cf2f6d2fadf9aa89c3d5247e10a63fab7d1cd76a5ccfa0f01c25496a1
-size 83565
diff --git a/Content/Meshes/blocking04.max b/Content/Meshes/blocking04.max
deleted file mode 100644
index a0184fb..0000000
--- a/Content/Meshes/blocking04.max
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca5795e3776f66d6905606631efa1f8852bc67f77ff9479e5090b76bd348136e
-size 3932160
diff --git a/Content/Meshes/hand_05.uasset b/Content/Meshes/hand_05.uasset
deleted file mode 100644
index 3c2e035..0000000
--- a/Content/Meshes/hand_05.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e5739573c93b9735f7e82e32abc9a6f1b7a2a9271dce84e427621090128dca66
-size 997
diff --git a/Content/Props/SM_Lamp_Wall.uasset b/Content/Props/SM_Lamp_Wall.uasset
deleted file mode 100644
index 0b15ab4..0000000
--- a/Content/Props/SM_Lamp_Wall.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3c96ccbc2f74ec65bbdebc743ad55bbd9c7d7c549e052f5494f9f56fc6a80c71
-size 184801
diff --git a/Source/Octogonia/CustomSpline.cpp b/Source/Octogonia/CustomSpline.cpp
index de513db..256a0dc 100644
--- a/Source/Octogonia/CustomSpline.cpp
+++ b/Source/Octogonia/CustomSpline.cpp
@@ -13,10 +13,10 @@ ACustomSpline::ACustomSpline()
 	RootComponent = Root;
 
 	Spline = CreateDefaultSubobject<USplineComponent>("Spline");
-	Spline->AttachToComponent(RootComponent, FAttachmentTransformRules(EAttachmentRule::KeepWorld, false));
+	Spline->SetupAttachment(RootComponent);
 
 	MeshesContainer = CreateDefaultSubobject<USceneComponent>("RailMeshesContainer");
-	MeshesContainer->AttachToComponent(RootComponent, FAttachmentTransformRules(EAttachmentRule::KeepWorld, false));
+	MeshesContainer->SetupAttachment(RootComponent);
 
 }
 
@@ -109,7 +109,7 @@ void ACustomSpline::AddMeshPart(const FVector &startLocation, const FVector &sta
 	railMesh->SetStartAndEnd(startLocation + offset, startTangent, endLocation + offset, endTangent);
 
 	railMesh->SetMobility(EComponentMobility::Movable);
-	railMesh->AttachToComponent(MeshesContainer, FAttachmentTransformRules(EAttachmentRule::KeepWorld, false));
+	railMesh->SetupAttachment(MeshesContainer);
 	railMesh->RegisterComponent();
 }
 
diff --git a/Source/Octogonia/Drone.cpp b/Source/Octogonia/Drone.cpp
index 44d618f..771f149 100644
--- a/Source/Octogonia/Drone.cpp
+++ b/Source/Octogonia/Drone.cpp
@@ -25,11 +25,11 @@ ADrone::ADrone()
 	RootComponent = ColisionComponent;
 
 	Mesh = CreateDefaultSubobject<UDestructibleComponent>("Mesh", false);
-	Mesh->AttachToComponent(RootComponent, FAttachmentTransformRules(EAttachmentRule::SnapToTarget, false));
+	Mesh->SetupAttachment(RootComponent);
 	Mesh->OnComponentFracture.AddDynamic(this, &ADrone::DestroyDrone);
 
 	VisionSphere = CreateDefaultSubobject<USphereComponent>("VisionSphere", false);
-	VisionSphere->AttachToComponent(RootComponent, FAttachmentTransformRules(EAttachmentRule::SnapToTarget, false));
+	VisionSphere->SetupAttachment(RootComponent);
 	VisionSphere->SetSphereRadius(400, true);
 }
 
diff --git a/Source/Octogonia/PlayerCharacter.cpp b/Source/Octogonia/PlayerCharacter.cpp
index 08f818d..2f5c0a6 100644
--- a/Source/Octogonia/PlayerCharacter.cpp
+++ b/Source/Octogonia/PlayerCharacter.cpp
@@ -13,31 +13,31 @@ APlayerCharacter::APlayerCharacter()
 	PrimaryActorTick.bCanEverTick = true;
 
 	Camera = CreateDefaultSubobject<UCameraComponent>("Camera");
-	Camera->AttachToComponent(RootComponent, FAttachmentTransformRules(EAttachmentRule::KeepRelative, false));
+	Camera->SetupAttachment(RootComponent);
 
 	RightHandContainer = CreateDefaultSubobject<USceneComponent>("RightHandContainer");
-	//RightHandContainer->AttachToComponent(Camera, FAttachmentTransformRules(EAttachmentRule::KeepRelative, false));
-	RightHandContainer->AttachToComponent(RootComponent, FAttachmentTransformRules(EAttachmentRule::KeepRelative, false));
+	//RightHandContainer->SetupAttachment(Camera);
+	RightHandContainer->SetupAttachment(RootComponent);
 
 	LeftHandContainer = CreateDefaultSubobject<USceneComponent>("LeftHandContainer");
-	//LeftHandContainer->AttachToComponent(Camera, FAttachmentTransformRules(EAttachmentRule::KeepRelative, false));
-	LeftHandContainer->AttachToComponent(RootComponent, FAttachmentTransformRules(EAttachmentRule::KeepRelative, false));
+	//LeftHandContainer->SetupAttachment(Camera);
+	LeftHandContainer->SetupAttachment(RootComponent);
 
 	RightHandMesh2 = CreateDefaultSubobject<USkeletalMeshComponent>("RightHandMesh2");
-	RightHandMesh2->AttachToComponent(RightHandContainer, FAttachmentTransformRules(EAttachmentRule::KeepRelative, false));
+	RightHandMesh2->SetupAttachment(RightHandContainer);
 
 	LeftHandMesh = CreateDefaultSubobject<USkeletalMeshComponent>("LeftHandMesh");
-	LeftHandMesh->AttachToComponent(LeftHandContainer, FAttachmentTransformRules(EAttachmentRule::KeepRelative, false));
+	LeftHandMesh->SetupAttachment(LeftHandContainer);
 
 	RightHandHookPoint = CreateDefaultSubobject<USceneComponent>("RightHandHookPoint");
-	RightHandHookPoint->AttachToComponent(RightHandMesh2, FAttachmentTransformRules(EAttachmentRule::KeepRelative, false));
+	RightHandHookPoint->SetupAttachment(RightHandMesh2);
 
 	LeftHandHookPoint = CreateDefaultSubobject<USceneComponent>("LeftHandHookPoint");
-	LeftHandHookPoint->AttachToComponent(LeftHandMesh, FAttachmentTransformRules(EAttachmentRule::KeepRelative, false));
+	LeftHandHookPoint->SetupAttachment(LeftHandMesh);
 	/**/
 	EnergyLevelIndicator = CreateDefaultSubobject<UTextRenderComponent>("EnergyLevel");
-	EnergyLevelIndicator->AttachToComponent(RightHandMesh2, FAttachmentTransformRules(EAttachmentRule::KeepRelative, false));
-	EnergyLevelIndicator->SetText(FString::SanitizeFloat(this->EnergyLevel));
+	EnergyLevelIndicator->SetupAttachment(RightHandMesh2);
+	EnergyLevelIndicator->SetText(FText::AsNumber(this->EnergyLevel));
 	EnergyLevelIndicator->SetTextRenderColor(colorDamage);
 	EnergyLevelIndicator->SetWorldSize(6.0f);
 	EnergyLevel = MaxEnergyLevel;
@@ -254,7 +254,7 @@ void APlayerCharacter::ModifyEnergy(float value)
 	if (EnergyLevel > MaxEnergyLevel) {
 		EnergyLevel = MaxEnergyLevel;
 	}
-	EnergyLevelIndicator->SetText(FString::SanitizeFloat(this->EnergyLevel));
+	EnergyLevelIndicator->SetText(FText::AsNumber(this->EnergyLevel));
 	ChangeGunMaterial();
 }
 
diff --git a/Source/Octogonia/RailWagon.cpp b/Source/Octogonia/RailWagon.cpp
index c31db5e..f430d0d 100644
--- a/Source/Octogonia/RailWagon.cpp
+++ b/Source/Octogonia/RailWagon.cpp
@@ -16,12 +16,12 @@ ARailWagon::ARailWagon()
 	RootComponent = Root;
 
 	AnchorPoint = CreateDefaultSubobject<USceneComponent>("AnchorPoint");
-	AnchorPoint->AttachToComponent(RootComponent, FAttachmentTransformRules(EAttachmentRule::KeepRelative, false));
+	AnchorPoint->SetupAttachment(RootComponent);
 
 	DroneAverageSpeedHeuristic = 0.9f;
 
 	Mesh = CreateDefaultSubobject<UStaticMeshComponent>("Mesh");
-	Mesh->AttachToComponent(RootComponent, FAttachmentTransformRules(EAttachmentRule::KeepRelative, false));
+	Mesh->SetupAttachment(RootComponent);
 }
 
 // Called when the game starts or when spawned
diff --git a/Source/Octogonia/SeekerDrone.cpp b/Source/Octogonia/SeekerDrone.cpp
index f4dfd07..a838741 100644
--- a/Source/Octogonia/SeekerDrone.cpp
+++ b/Source/Octogonia/SeekerDrone.cpp
@@ -16,18 +16,18 @@ ASeekerDrone::ASeekerDrone()
 	RootComponent = CollisionCoponent;
 
 	SkeletalMesh = CreateDefaultSubobject<USkeletalMeshComponent>("Body", false);
-	SkeletalMesh->AttachToComponent(RootComponent, FAttachmentTransformRules(EAttachmentRule::KeepRelative, false));
+	SkeletalMesh->SetupAttachment(RootComponent);
 
 	EatingSphere = CreateDefaultSubobject<USphereComponent>("Eating Sphere ", false);
 	EatingSphere->SetSphereRadius(200, true);
-	EatingSphere->AttachToComponent(RootComponent, FAttachmentTransformRules(EAttachmentRule::KeepRelative, false));
+	EatingSphere->SetupAttachment(RootComponent);
 
 	VisionSphere = CreateDefaultSubobject<USphereComponent>("VisionSphere", false);
-	VisionSphere->AttachToComponent(RootComponent, FAttachmentTransformRules(EAttachmentRule::SnapToTarget, false));
+	VisionSphere->SetupAttachment(RootComponent);
 	VisionSphere->SetSphereRadius(400, true);
 
 	eyeSocket = CreateDefaultSubobject<USceneComponent>("Eye Socket", false);
-	eyeSocket->AttachToComponent(RootComponent, FAttachmentTransformRules(EAttachmentRule::KeepRelative, false));
+	eyeSocket->SetupAttachment(RootComponent);
 }
 void ASeekerDrone::EatNearbyDrone(float DeltaSeconds)
 {