diff --git a/EndlessVendetta/Config/DefaultEngine.ini b/EndlessVendetta/Config/DefaultEngine.ini
index d31a91fb..fd61a935 100644
--- a/EndlessVendetta/Config/DefaultEngine.ini
+++ b/EndlessVendetta/Config/DefaultEngine.ini
@@ -60,7 +60,7 @@
 +CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn")
 
 [/Script/EngineSettings.GameMapsSettings]
-EditorStartupMap=/Game/Levels/MainMenuLevel.MainMenuLevel
+EditorStartupMap=/Game/Levels/AITest.AITest
 LocalMapOptions=
 TransitionMap=None
 bUseSplitscreen=True
diff --git a/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset b/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset
index eb9f276c..9c97d447 100644
--- a/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset
+++ b/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2c46611621707c4a12a15374d5b4a710de5b654a57e18db1c3ebdf9f2fdabe83
-size 143601
+oid sha256:9c268b1483a8b92c1b103dd1efc9f354c17c31f92b6ef2af41a4893bb9b63062
+size 143554
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset
index 9383a368..1c672c2a 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:7dde3601d606a39304db2070e80b8a7d61659fe63288a6b5ebaa79476a10cb50
-size 148928
+oid sha256:8d5b9b574cce4c115d12e4022cb1d11420e48614a851d0dab46199aee45ad6d2
+size 238431
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/8N/O8PP5KE5USY7FTAE75J65R.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/8N/O8PP5KE5USY7FTAE75J65R.uasset
index 2f4a55a4..ccb0acc7 100644
--- a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/8N/O8PP5KE5USY7FTAE75J65R.uasset
+++ b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/8N/O8PP5KE5USY7FTAE75J65R.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:047811fb2f92768edde6903164d7ace9ed8f5bbae8831f7618f1c58205dce26c
+oid sha256:461171dba6a85d0e829f1f673756b08af877379d651c7bfcd0028b6de32a36d7
 size 6554
diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp
index 37c05e62..3f92f5ac 100644
--- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp
@@ -179,7 +179,7 @@ void ABaseWeaponClass::Fire()
 		traceEnd = traceStart + (GunStartArrow->GetForwardVector() * BulletDistance);
 		if (GetWorldTimerManager().IsTimerActive(timerHandle)) return;
 		GetWorld()->LineTraceSingleByChannel(outHit, traceStart, traceEnd, ECC_Visibility, collisionParams);
-		DrawDebugLine(this->GetWorld(), traceStart, traceEnd, FColor::Black , false, 0.2f, 0U, 0.2f);
+		WeaponFired.Broadcast();
 		playerControllerRef->PlayerCameraManager->StartCameraShake(CameraShakeClass, 1);
 		currentAmmoCount -= 1;
 		GenerateRecoilVector();
diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h
index ea33cad6..3219e7de 100644
--- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h
+++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h
@@ -27,7 +27,7 @@ protected:
 	virtual void BeginPlay() override;
 
 	virtual void ApplyRecoil(float DeltaTime);
-	
+
 	void GenerateRecoilVector();
 
 	void nullSamples();
@@ -45,22 +45,20 @@ protected:
 
 	UFUNCTION(BlueprintImplementableEvent)
 	void ShowReloadingWidget();
-	
+
 	UFUNCTION(BlueprintImplementableEvent)
 	void HideReloadingWidget();
 
-
-
 public:
 	// Called every frame
 	virtual void Tick(float DeltaTime) override;
 	void ReloadTimer();
-	
+
 	float currentPitch;
-	
+
 	UPROPERTY(EditAnywhere)
 	float BulletDistance;
-	
+
 	UPROPERTY(EditAnywhere, BlueprintReadWrite)
 	FString WeaponName;
 
@@ -111,9 +109,9 @@ public:
 
 	UPROPERTY(VisibleAnywhere)
 	ACharacter* playerInWorld;
-	
+
 	AEndlessVendettaCharacter* endlessVendettaChar;
-	
+
 	APlayerController* playerControllerRef;
 
 	FTimerHandle timerHandle;
@@ -169,7 +167,7 @@ public:
 
 	void Interact() override;
 
-    void InteractPrompt() override;
+	void InteractPrompt() override;
 
 	UFUNCTION(BlueprintImplementableEvent)
 	void WeaponStatsPopUp();
@@ -185,6 +183,11 @@ public:
 	UFUNCTION(BlueprintImplementableEvent)
 	void HideNeedReloadUI();
 
+	DECLARE_DYNAMIC_MULTICAST_DELEGATE(FWeaponFired);
+
+	UPROPERTY(BlueprintAssignable, Category = "Weapons")
+	FWeaponFired WeaponFired;
+
 protected:
 	UArrowComponent* GunStartArrow;
 	bool bStopShooting = false;