diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset
index 942e3bb2..dd7dd0f7 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:835c097b3a17338495ff44616dc23bd30b64a0ec073785f9ea50010d9fe08546
-size 41553
+oid sha256:be2df8f3887c25a9cc9b7c38b6bb39d1a84c9fbaa04e45dd68c5acc5c4c83a78
+size 40852
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset
index 1c672c2a..1a047483 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d5b9b574cce4c115d12e4022cb1d11420e48614a851d0dab46199aee45ad6d2
-size 238431
+oid sha256:f123a6be394692bcf1008c3ca474412b1dea16cf5162e4403e5bfeffecf7aaca
+size 232957
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset
index 530f332e..f5dd6321 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0dc340b553531be453d5c905366d4b7f5ee963b825809bc2a9862857db42a48
-size 149397
+oid sha256:de73d2ac1fc0b7edb6bf31f180d0911728cdbb24a2742ee49cc13777440d8c09
+size 148132
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/24/JBARER4CBJ0QZT5CZY8ID6.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/24/JBARER4CBJ0QZT5CZY8ID6.uasset
index d602682b..cc218a93 100644
--- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/24/JBARER4CBJ0QZT5CZY8ID6.uasset
+++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/24/JBARER4CBJ0QZT5CZY8ID6.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b23ffe118dd1641c807cd8f9ffa43063c1e16ac7e95f4d4a09bd8f4f2030e504
-size 6596
+oid sha256:624574d06d0678bdb53ec083c7b9635e45021665db71193cdbbd1c149026a7ba
+size 6519
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/GQ/QPISORMXEPSB0MNOUMBIZ4.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/GQ/QPISORMXEPSB0MNOUMBIZ4.uasset
index cf89892d..4ebc02bf 100644
--- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/GQ/QPISORMXEPSB0MNOUMBIZ4.uasset
+++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/GQ/QPISORMXEPSB0MNOUMBIZ4.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1443a0a8f338f4b7a64d85b7c9bce3084f8c03a4da6927cf69d5c3fde98d9dab
-size 6516
+oid sha256:be9ead9b6e2287def289d84c6e530b269908be77686eebdca96acc7a7039000e
+size 6593
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/V5/00HOTT7GJB6N5M6TZHPJO5.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/V5/00HOTT7GJB6N5M6TZHPJO5.uasset
index e1d2e879..f35d5c73 100644
--- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/V5/00HOTT7GJB6N5M6TZHPJO5.uasset
+++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/V5/00HOTT7GJB6N5M6TZHPJO5.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2fc49ed8abd698fc05114d406436c49a7967ece3a59e32c40ee5bd04502e6c9d
-size 6686
+oid sha256:227182e3c4bf297a0f312798841c02a738f6cf738d30d574a85f837401023418
+size 6609
diff --git a/EndlessVendetta/EndlessVendetta.sln.DotSettings.user b/EndlessVendetta/EndlessVendetta.sln.DotSettings.user
deleted file mode 100644
index 2b08f3a1..00000000
--- a/EndlessVendetta/EndlessVendetta.sln.DotSettings.user
+++ /dev/null
@@ -1,2 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/Environment/Highlighting/HighlightingSourceSnapshotLocation/@EntryValue">C:\Users\Rafal\AppData\Local\JetBrains\Rider2023.3\resharper-host\temp\Rider\vAny\CoverageData\_EndlessVendetta.-1253833435\Snapshot\snapshot.utdcvr</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp
index d77d04eb..556634fb 100644
--- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp
@@ -251,6 +251,7 @@ void AEndlessVendettaCharacter::SetupPlayerInputComponent(class UInputComponent*
 
 void AEndlessVendettaCharacter::Interact()
 {
+	if (bIsReloading) return;
 	UE_LOG(LogTemp, Warning, TEXT("Interaction Has Been Called"));
 	if (InPauseMenu) return;
 	if (bIsInDialogue)
@@ -336,6 +337,7 @@ float AEndlessVendettaCharacter::TakeDamage(const float DamageAmount, FDamageEve
 
 void AEndlessVendettaCharacter::ToggleRecon()
 {
+	if (bIsReloading) return;
 	if (PlayerOnShip || InPauseMenu) return;
 	if (!GadgetManager->IsValidReconGadget()) return;
 
@@ -359,6 +361,7 @@ void AEndlessVendettaCharacter::ToggleRecon()
 
 void AEndlessVendettaCharacter::ToggleCombat()
 {
+	if (bIsReloading) return;
 	if (PlayerOnShip || InPauseMenu) return;
 	if (!GadgetManager->IsValidCombatGadget()) return;
 
@@ -384,6 +387,7 @@ void AEndlessVendettaCharacter::ToggleCombat()
 //When 1 is pressed it calls EquipPrimary
 void AEndlessVendettaCharacter::EquipPrimary()
 {
+	if (bIsReloading) return;
 	if (PlayerOnShip || InPauseMenu) return;
 	if (!IsValid(PrimaryWeaponClass)) return;
 	FActorSpawnParameters spawnParams;
@@ -444,6 +448,7 @@ void AEndlessVendettaCharacter::EquipPrimary()
 
 void AEndlessVendettaCharacter::EquipSecondary()
 {
+	if (bIsReloading) return;
 	if (!IsValid(SecondaryWeaponClass)) return;
 	if (PlayerOnShip || InPauseMenu) return;
 	FActorSpawnParameters spawnParams;
@@ -498,6 +503,7 @@ void AEndlessVendettaCharacter::EquipSecondary()
 
 void AEndlessVendettaCharacter::WeaponSwitcher(AActor* Outhit)
 {
+	if (bIsReloading) return;
 	FAttachmentTransformRules AttachmentRules(EAttachmentRule::SnapToTarget, true);
 	FDetachmentTransformRules DetatchRules(EDetachmentRule::KeepWorld, false);
 	FActorSpawnParameters spawnParams;
@@ -571,6 +577,7 @@ void AEndlessVendettaCharacter::WeaponSwitcher(AActor* Outhit)
 //Calls the fire function in the baseWeaponClass
 void AEndlessVendettaCharacter::FireCaller()
 {
+	if (bIsReloading) return;
 	if (InPauseMenu) return;
 	if (IsValid(PrimaryWeapon) && !bIsReloading)
 	{
@@ -596,6 +603,7 @@ void AEndlessVendettaCharacter::StopFire()
 
 void AEndlessVendettaCharacter::GunRightClick()
 {
+	if (bIsReloading) return;
 	if (InPauseMenu) return;
 	if (IsValid(PrimaryWeapon) && !bIsScoped)
 	{
@@ -615,6 +623,7 @@ void AEndlessVendettaCharacter::GunRightClick()
 
 void AEndlessVendettaCharacter::StopGunRightClick()
 {
+	if (bIsReloading) return;
 	if (IsValid(PrimaryWeapon))
 	{
 		bIsScoped = false;
diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.cpp
index d120d561..884de46c 100644
--- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.cpp
@@ -37,7 +37,11 @@ void AShotgunClass::Fire()
 			FVector newStartTrace = UKismetMathLibrary::RandomPointInBoundingBox(traceStart, ShotgunBulletSpread);
 			traceEnd = newStartTrace + (GunStartArrow->GetForwardVector() * BulletDistance);
 			GetWorld()->LineTraceSingleByChannel(outHit, newStartTrace, traceEnd, ECC_Visibility, collisionParams);
-			DrawDebugLine(this->GetWorld(), newStartTrace, traceEnd, FColor::Black , false, 0.2f, 0U, 0.2f);
+			DrawDebugLine(this->GetWorld(), newStartTrace, traceEnd, FColor::Yellow , false, 500.2f, 0U, 0.2f);
+			if (outHit.bBlockingHit)
+			{
+				GEngine->AddOnScreenDebugMessage(-1, 20.f, FColor::Orange, FString(TEXT("SHOTGUN HIT")));
+			}
 		}
 		currentAmmoCount --;
 		playerControllerRef->PlayerCameraManager->StartCameraShake(CameraShakeClass, 1);