diff --git a/Assets/UI/UI_Bar_Fill.png b/Assets/UI/UI_Bar_Fill.png
new file mode 100644
index 00000000..11f19b95
--- /dev/null
+++ b/Assets/UI/UI_Bar_Fill.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e5ee098dda8de99c8f10705e2aca1d4d142a91e028a5ca86d1c90acb3bb78fda
+size 3158
diff --git a/Assets/UI/UI_Bar_Outline.png b/Assets/UI/UI_Bar_Outline.png
new file mode 100644
index 00000000..bc4600c5
--- /dev/null
+++ b/Assets/UI/UI_Bar_Outline.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9fc8bc9b68a6b62c5f7db980c09b1b5ce2a320e44a7939a6fc4aa09b445b8cda
+size 3138
diff --git a/EndlessVendetta/Config/DefaultEngine.ini b/EndlessVendetta/Config/DefaultEngine.ini
index e813683b..5a90c34b 100644
--- a/EndlessVendetta/Config/DefaultEngine.ini
+++ b/EndlessVendetta/Config/DefaultEngine.ini
@@ -154,8 +154,8 @@ ManualIPAddress=
 +PropertyRedirects=(OldName="/Script/EndlessVendetta.BaseWeaponClass.player",NewName="/Script/EndlessVendetta.BaseWeaponClass.playerInWorld")
 
 [/Script/NavigationSystem.RecastNavMesh]
-AgentMaxStepHeight=73.434059
-AgentMaxSlope=64.648003
+AgentMaxStepHeight=45.929649
+AgentMaxSlope=45.053085
 CellSize=10.000000
 RuntimeGeneration=Dynamic
 
diff --git a/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset b/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset
index 1d2734e4..8fa26b1c 100644
--- a/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset
+++ b/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bbfb60916a9c0c6eb0b0c22c4fbf890ea502ce090da3c24aff038297078ef9b8
-size 86630
+oid sha256:e89d7a0fe15df57fc1fb57af25a3d5914691c156f56d867080dee8f647223808
+size 87164
diff --git a/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset b/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset
index 9c97d447..361d0d40 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:9c268b1483a8b92c1b103dd1efc9f354c17c31f92b6ef2af41a4893bb9b63062
-size 143554
+oid sha256:d35b41342c9550d5e5b4956552eb99ff17a3f4f2eed7857336d19966d87d99cb
+size 184178
diff --git a/EndlessVendetta/Content/AI/Enemy/Basic/BT_BasicEnemy.uasset b/EndlessVendetta/Content/AI/Enemy/Basic/BT_BasicEnemy.uasset
index 4a874ddc..cdcb890d 100644
--- a/EndlessVendetta/Content/AI/Enemy/Basic/BT_BasicEnemy.uasset
+++ b/EndlessVendetta/Content/AI/Enemy/Basic/BT_BasicEnemy.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:019e879ee15b4850fb9e601944cc2337663d20b4240b0cdf5006727321a0e496
-size 80128
+oid sha256:0476e9712ee5e2767e2a60ae4bfdf21ca085b391c0215095f4981c8b785c07b1
+size 78165
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset
index dcc2f9a2..daa31bc7 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db519139be98b60c93661d3f713abebf65ca4f6b150b880737dc34987a5ff14f
-size 38384
+oid sha256:649bbaeec1f17b7df76ca85f97bb654fd015f1f60ecc4ad609be522c8c84424d
+size 47984
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/UI_Bar_Fill.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/UI_Bar_Fill.uasset
new file mode 100644
index 00000000..8fe33c23
--- /dev/null
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/UI_Bar_Fill.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b9f3fc131c430ec3e685954e4a38df3470f44e5789f7aba6cbc765b5a2b8573b
+size 8992
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/UI_Bar_Outline.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/UI_Bar_Outline.uasset
new file mode 100644
index 00000000..c6fb8419
--- /dev/null
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/UI_Bar_Outline.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c6f06eb6ba856c4066ca5299d72062828a630d0484ddb436bd6b76154664a22
+size 8508
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset
index 29ebde67..4733d876 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ac7733948c885fda46dd009dd75dfe5c79abf1262e9aadcf17c401bb8f64ecf
-size 93512
+oid sha256:9e63da0bec22702c2595b0f18fcde7736c09338b1942964a304b7c40be4501f8
+size 140987
diff --git a/EndlessVendetta/Content/MetaHumans/Dhruv/BP_Dhruv.uasset b/EndlessVendetta/Content/MetaHumans/Dhruv/BP_Dhruv.uasset
index 30848631..f73e6b8b 100644
--- a/EndlessVendetta/Content/MetaHumans/Dhruv/BP_Dhruv.uasset
+++ b/EndlessVendetta/Content/MetaHumans/Dhruv/BP_Dhruv.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a316db2f6fe9c19dd2c2b4212b38773c9ab69365f79d55d31a4d0d165dc4c71
-size 457886
+oid sha256:e39c628f74635fd9b8e8911c3ba0f34b6739e84ae5a2d39e9b1c54e0b1ab9403
+size 457290
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/4/DF/EI4FFQ2STMC3TRHBQOUNH5.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/4/DF/EI4FFQ2STMC3TRHBQOUNH5.uasset
index f4c19c6c..900fb210 100644
--- a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/4/DF/EI4FFQ2STMC3TRHBQOUNH5.uasset
+++ b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/4/DF/EI4FFQ2STMC3TRHBQOUNH5.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eaeb890cdb58d88b164d2eb5d277385d812ed5319aa222cedee46f892602c24e
-size 123322
+oid sha256:5885a7e31d81ffba0a3bf28ab1a637cdffd3c5147759edb8c13315524369eee6
+size 123293
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/5/95/31WBX0XWARTHM3RCYSFU9M.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/5/95/31WBX0XWARTHM3RCYSFU9M.uasset
index f4a9674c..46d921da 100644
--- a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/5/95/31WBX0XWARTHM3RCYSFU9M.uasset
+++ b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/5/95/31WBX0XWARTHM3RCYSFU9M.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9544a21d231770f149e023911478ef866a28432f9a8594c997aeac39fb69c9ba
+oid sha256:e0f16f5d8d2fed7e2876116dac5e273f1d9b5ea79fad0042b9ec4d6dd70352b5
 size 5644
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/8/OF/W8X5ON78DR25CQV6QFGJO4.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/8/OF/W8X5ON78DR25CQV6QFGJO4.uasset
index 68c2d846..279c9739 100644
--- a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/8/OF/W8X5ON78DR25CQV6QFGJO4.uasset
+++ b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/8/OF/W8X5ON78DR25CQV6QFGJO4.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:287cefc679ae187520972601785415ede0e78e970f51012db4dec2e94058c6c6
+oid sha256:2d5c9ab9a2df58793d2eaa02532b14b82c9aeed59caab390441f9c9973b5db31
 size 5977
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/A/9W/KV7XP1AJXG9P45HFKK5F76.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/A/9W/KV7XP1AJXG9P45HFKK5F76.uasset
index 046856da..b6529d55 100644
--- a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/A/9W/KV7XP1AJXG9P45HFKK5F76.uasset
+++ b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/A/9W/KV7XP1AJXG9P45HFKK5F76.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f3eed22e9a75e30cebd8574185c54a478a3b8179caccb511cab24ab86f6609b1
-size 16471
+oid sha256:16cfe138259c36e77c2ed4c6dd7a356bf31d23a52f5cbd20d0dbfcc88047c48c
+size 35743
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/8N/O8PP5KE5USY7FTAE75J65R.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/8N/O8PP5KE5USY7FTAE75J65R.uasset
index ccb0acc7..c1e62052 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:461171dba6a85d0e829f1f673756b08af877379d651c7bfcd0028b6de32a36d7
+oid sha256:2ec8c02c25733c7a4a32c82f2d0e412cc84745c4400caf98507101420f833b0a
 size 6554
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/O6/IM2ZR0FZ5KH20UIRPAQT2P.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/O6/IM2ZR0FZ5KH20UIRPAQT2P.uasset
new file mode 100644
index 00000000..66fd1c98
--- /dev/null
+++ b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/O6/IM2ZR0FZ5KH20UIRPAQT2P.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:32471663a90c365b24ba1d0f9625c4b79cb785c7fd0f036d09549079e6e77345
+size 6568
diff --git a/EndlessVendetta/Source/EndlessVendetta/AI/Tasks/BTTask_AttackPlayer.cpp b/EndlessVendetta/Source/EndlessVendetta/AI/Tasks/BTTask_AttackPlayer.cpp
index 3b4ff281..95cd2d5b 100644
--- a/EndlessVendetta/Source/EndlessVendetta/AI/Tasks/BTTask_AttackPlayer.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/AI/Tasks/BTTask_AttackPlayer.cpp
@@ -20,16 +20,21 @@ EBTNodeResult::Type UBTTask_AttackPlayer::ExecuteTask(UBehaviorTreeComponent& Ow
 	{
 		if (const UBlackboardComponent* const Blackboard = OwnerComp.GetBlackboardComponent())
 		{
-			FVector const Origin = AIController->GetPawn()->GetActorLocation();
-			FVector const Start = Origin + FVector(0.f, 0.f, 30.f);
-			FVector const PlayerLocation = Blackboard->GetValueAsVector("TargetLocation");
+			USkeletalMeshComponent* GunSKMesh = nullptr;
+			if (AIController->GetPawn()->GetComponentsByTag(USkeletalMeshComponent::StaticClass(), "Gun").Num() > 0)
+			{
+				GunSKMesh = Cast<USkeletalMeshComponent>(AIController->GetPawn()->GetComponentsByTag(USkeletalMeshComponent::StaticClass(), "Gun")[0]);
+			}
+			FVector const Origin = IsValid(GunSKMesh) ? GunSKMesh->GetComponentLocation() : AIController->GetPawn()->GetActorLocation() + FVector(0.f, 0.f, 30.f);
+			FVector const Start = Origin;
+			FVector const End = Origin + AIController->GetPawn()->GetActorForwardVector() * 10000.f;
 			if (AEnemyCharacter* const EnemyCharacter = Cast<AEnemyCharacter>(AIController->GetPawn()))
 			{
 				EnemyCharacter->FireWeapon.Broadcast();
 				EnemyCharacter->SetFiring(true);
 				FCollisionQueryParams QueryParams;
 				QueryParams.AddIgnoredActor(AIController->GetPawn());
-				if (FHitResult HitResult; GetWorld()->LineTraceSingleByChannel(HitResult, Start, PlayerLocation, ECC_Pawn, QueryParams))
+				if (FHitResult HitResult; GetWorld()->LineTraceSingleByChannel(HitResult, Start, End, ECC_Pawn, QueryParams))
 				{
 					if (IsValid(HitResult.GetActor()))
 					{