diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
index ea9b685a..72afc9b7 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58139ccad1a63dd9fa03404f0fb0b7af3f742d844b0ed7da0e081b96319600b9
-size 54773
+oid sha256:80bdfba79839b49cc81b7204874717f7e07053dc9ed0eb7268757ba8c4468dfc
+size 64721
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset
index 0a4f058e..afb9e04f 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a92359cc39feb0549f88beb0aa498c448b67afac995e88ffa2de837ad2024ec
-size 80434
+oid sha256:9542ee06b35222a672fe9b174d7bac25c3b4022cb10845468a636220a2eb17ef
+size 139049
diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap
index 174ac378..adaa584c 100644
--- a/EndlessVendetta/Content/Levels/TrainingFacility.umap
+++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7711a7f6afcfd75419a73d627b6359ec3fb76c48d9dbb34e50b2a2318ee05b7d
-size 679380
+oid sha256:382de64e5d1bd7a390f39800df5728e144d6c7198abc0f7e942b17816fdf175d
+size 679254
diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp
index 314532d4..7ef3ff9d 100644
--- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp
@@ -70,7 +70,6 @@ void ABountyClass::IncrementBountyCheckpoint()
 		BountyCheckpoints[0]->Destroy();
 		BountyCheckpoints.RemoveAt(0);
 		UE_LOG(LogTemp, Warning, TEXT(" You've Completed the Bounty!! Well done"));
-		Cast<AEndlessVendettaCharacter>(GetWorld()->GetFirstPlayerController()->GetPawn())->CheckpointCompletedUI(FString(""));
 		return;
 	}
 
@@ -90,9 +89,6 @@ void ABountyClass::IncrementBountyCheckpoint()
 	BountyCheckpoints[0]->SpawnWaypoint(BountyTitle);
 	BountyCheckpoints[0]->CheckpointActivated();
 	BountyCheckpoints[0]->CompletedCheckpoint.AddDynamic(this, &ABountyClass::IncrementBountyCheckpoint);
-
-	Cast<AEndlessVendettaCharacter>(GetWorld()->GetFirstPlayerController()->GetPawn())->CheckpointCompletedUI(BountyCheckpoints[0]->GetCheckpointTip());
-	
 }
 
 void ABountyClass::CollectRewards_Implementation()
diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h
index 88a6c5e7..35b33288 100644
--- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h
+++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h
@@ -100,16 +100,7 @@ public:
 
 		return BountyCheckpoints[0]->GetWaypointIcon();
 	}
-
-	FString GetCheckpointDescription()
-	{
-		if (BountyCheckpoints.IsEmpty() || BountyCheckpoints[0] == nullptr)
-		{
-			return FString("No more Bounty checkpoints, check BountyClass.h GetCheckpointDescription()");
-		}
-
-		return BountyCheckpoints[0]->GetCheckpointDesc();
-	}
+	
 	// ----------------------------------------------------------
 
 	// Sets default values for this actor's properties
diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h
index 380f2e5b..68931530 100644
--- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h
+++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h
@@ -20,8 +20,6 @@ class ENDLESSVENDETTA_API ACheckpointClass : public AActor
 
 	// ------ Properties set from Editor ------
 	UPROPERTY(EditDefaultsOnly, Category = "Checkpoint")
-	FString CheckpointDescription;
-	UPROPERTY(EditDefaultsOnly, Category = "Checkpoint")
 	FString CheckpointTip;
 	UPROPERTY(EditDefaultsOnly, Category = "Checkpoint")
 	FVector WaypointLoc;
@@ -61,10 +59,6 @@ public:
 	void CheckpointActivated();
 
 	// ------ Getters for CP Properties ------
-	FString GetCheckpointDesc()
-	{
-		return CheckpointDescription;
-	}
 
 	FString GetCheckpointTip()
 	{
diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp
index f6cc0edd..cab4f924 100644
--- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp
@@ -3,6 +3,15 @@
 
 #include "MainBountyClass.h"
 
+void AMainBountyClass::IncrementBountyCheckpoint()
+{
+	Super::IncrementBountyCheckpoint();
+	FString TipToDisplay = "";
+	if (!Completed) TipToDisplay = BountyCheckpoints[0]->GetCheckpointTip();
+	Cast<AEndlessVendettaCharacter>(GetWorld()->GetFirstPlayerController()->GetPawn())->CheckpointCompletedUI(TipToDisplay, Completed);
+}
+
+
 void AMainBountyClass::SpawnAmmoDrops()
 {
 	UE_LOG(LogTemp, Display, TEXT("Bought Ammo Drops, but its not implemented yet"));
diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h
index 96dc99cc..6ec84be1 100644
--- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h
+++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h
@@ -15,6 +15,8 @@ class ENDLESSVENDETTA_API AMainBountyClass : public ABountyClass
 {
 	GENERATED_BODY()
 
+	void IncrementBountyCheckpoint() override;
+
 protected:
 	UPROPERTY(EditDefaultsOnly, Category = "Bounty")
 	TArray<TSubclassOf<ASideBountyClass>> SideBountiesToSpawn;
diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h
index 8bfa7c05..88f03847 100644
--- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h
+++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h
@@ -228,7 +228,7 @@ public:
 	void WeaponSwitcher(AActor* Outhit);
 
 	UFUNCTION(BlueprintImplementableEvent)
-	void CheckpointCompletedUI(const FString& CheckpointDesc);
+	void CheckpointCompletedUI(const FString& CheckpointDesc, bool CompletedBounty = false);
 
 	// Returns true if successfully changed to a new gadget, can fail if the target gadget to replace is being used
 	bool UpdateGadgetType(TSubclassOf<AGadgetBase> NewGadgetClass);