diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
index e297b877..21fe1158 100644
--- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
+++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
@@ -9,13 +9,10 @@
   <component name="ChangeListManager">
     <list default="true" id="8acc2658-cb31-4c49-857f-282cfee74640" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/FPWeapon/Mesh/SK_FPGun.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/FPWeapon/Mesh/SK_FPGun.uasset" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Content/StarterContent/Shapes/TempSilencer.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/Shapes/TempSilencer.uasset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/__ExternalActors__/Levels/DoorTestLevel/9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/__ExternalActors__/Levels/DoorTestLevel/9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/Workbench&amp;Attachments/SilencerAttachmentClass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/Workbench&amp;Attachments/SilencerAttachmentClass.cpp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -136,7 +133,7 @@
       <workItem from="1706110241756" duration="1092000" />
       <workItem from="1706705451486" duration="5218000" />
       <workItem from="1706727398145" duration="597000" />
-      <workItem from="1706790490396" duration="6139000" />
+      <workItem from="1706790490396" duration="10304000" />
     </task>
     <servers />
   </component>
diff --git a/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun.uasset b/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun.uasset
index ecd32d01..28e6c3fd 100644
--- a/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun.uasset
+++ b/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e5172de6da2ddc3a299ae29807f3c468faa1f5eadd7202e6e94688b92206faa8
-size 2113814
+oid sha256:388390c8d51429942976c17d06b5e4084e652f9b2554782794c1dad2d766438c
+size 2113778
diff --git a/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset b/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset
index 37e39f6f..8a95da14 100644
--- a/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset
+++ b/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8924c723b3b8eaf0a1a580f215de2a547d9118851c617ad590199910fa2f48c9
+oid sha256:a791858557c1d4a2c87aefc7d0cff0cb191cb6d496ec518f602ce3db92323815
 size 9020
diff --git a/EndlessVendetta/Content/StarterContent/Shapes/TempSilencer.uasset b/EndlessVendetta/Content/StarterContent/Shapes/TempSilencer.uasset
index b857d8a4..05ac52df 100644
--- a/EndlessVendetta/Content/StarterContent/Shapes/TempSilencer.uasset
+++ b/EndlessVendetta/Content/StarterContent/Shapes/TempSilencer.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb6b37e3900f88fd3a4a94643d255ddb765f6cacefc1b8adc92c5fb97e7393a8
-size 28238
+oid sha256:09bd5fb96ee510542e6f9c5439748cae1542863fd4909d649bf76be51e9d4468
+size 28225
diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp
index 0e458497..2c2b3c73 100644
--- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp
@@ -266,7 +266,7 @@ void ABaseWeaponClass::SetupSilencerAttachment(UStaticMesh* SilencerMesh)
 	{
 		if (IsValid(WeaponSkeletonMesh))
 		{
-			SilencerAttachmentClass->AttachToComponent(WeaponSkeletonMesh, FAttachmentTransformRules::SnapToTargetIncludingScale, FName(TEXT("SilencerSocketMesh")));
+			SilencerAttachmentClass->AttachToComponent(WeaponSkeletonMesh, FAttachmentTransformRules::SnapToTargetIncludingScale, FName(TEXT("SilencerMeshSocket")));
 			UE_LOG(LogTemp, Display, TEXT("All Attachment is valid"));
 			//this makes it showup in editor for better debugging
 			SilencerAttachmentClass->CreationMethod = EComponentCreationMethod::Instance;
@@ -276,6 +276,9 @@ void ABaseWeaponClass::SetupSilencerAttachment(UStaticMesh* SilencerMesh)
 			{
 				StaticMeshComp->AttachToComponent(SilencerAttachmentClass, FAttachmentTransformRules::SnapToTargetIncludingScale);
 				StaticMeshComp->SetStaticMesh(SilencerMesh);
+				StaticMeshComp->SetRelativeRotation(FRotator(0,90,0));
+				StaticMeshComp->SetCollisionEnabled(ECollisionEnabled::NoCollision);
+				//Making it show in editor for debugging
 				StaticMeshComp->CreationMethod = EComponentCreationMethod::Instance;
 				StaticMeshComp->RegisterComponent();
 			}