diff --git a/Project Reboot 3.0/FortGameModeAthena.cpp b/Project Reboot 3.0/FortGameModeAthena.cpp
index 2112109..049be2f 100644
--- a/Project Reboot 3.0/FortGameModeAthena.cpp	
+++ b/Project Reboot 3.0/FortGameModeAthena.cpp	
@@ -384,9 +384,6 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game
 
 		*/
 
-		static auto WarmupRequiredPlayerCountOffset = GameMode->GetOffset("WarmupRequiredPlayerCount");
-		GameMode->Get<int>(WarmupRequiredPlayerCountOffset) = 1;
-
 		static auto CurrentPlaylistDataOffset = GameState->GetOffset("CurrentPlaylistData", false);
 
 		if (CurrentPlaylistDataOffset != -1 || Fortnite_Version >= 6) // idk when they switched off id
@@ -795,6 +792,9 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game
 
 		GetWorld()->Listen();
 
+		static auto WarmupRequiredPlayerCountOffset = GameMode->GetOffset("WarmupRequiredPlayerCount");
+		GameMode->Get<int>(WarmupRequiredPlayerCountOffset) = WarmupRequiredPlayerCount;
+
 		LOG_INFO(LogNet, "WorldLevel {}", GameState->GetWorldLevel());
 
 		if (Globals::AmountOfListens == 1) // we only want to do this one time.
diff --git a/Project Reboot 3.0/FortPawn.cpp b/Project Reboot 3.0/FortPawn.cpp
index 35a91cd..f8aabe1 100644
--- a/Project Reboot 3.0/FortPawn.cpp	
+++ b/Project Reboot 3.0/FortPawn.cpp	
@@ -9,13 +9,13 @@ AFortWeapon* AFortPawn::EquipWeaponDefinition(UFortWeaponItemDefinition* WeaponD
 
 	FGuid TrackerGuid{};
 
-	if (Fortnite_Version < 16)
+	if (Fortnite_Version < 15.50)
 	{
 		struct { UObject* Def; FGuid Guid; AFortWeapon* Wep; } params{ WeaponData, ItemEntryGuid };
 		this->ProcessEvent(EquipWeaponDefinitionFn, &params);
 		return params.Wep;
 	}
-	else if (std::floor(Fortnite_Version) == 16)
+	else if (Fortnite_Version >= 15.50 && Fortnite_Version < 17)
 	{
 		struct { UObject* Def; FGuid Guid; FGuid TrackerGuid; AFortWeapon* Wep; } S16_params{ WeaponData, ItemEntryGuid, TrackerGuid };
 		this->ProcessEvent(EquipWeaponDefinitionFn, &S16_params);
diff --git a/Project Reboot 3.0/gui.h b/Project Reboot 3.0/gui.h
index a7cb2f0..a9965c9 100644
--- a/Project Reboot 3.0/gui.h	
+++ b/Project Reboot 3.0/gui.h	
@@ -86,6 +86,7 @@ extern inline bool bEnableBotTick = false;
 extern inline bool bZoneReversing = false;
 extern inline bool bEnableCombinePickup = false;
 extern inline int AmountOfBotsToSpawn = 0;
+extern inline int WarmupRequiredPlayerCount = 1;
 extern inline bool bEnableRebooting = false;
 extern inline bool bEngineDebugLogs = false;
 extern inline bool bStartedBus = false;
@@ -710,6 +711,11 @@ static inline void MainUI()
 					SetIsLategame(bWillBeLategame);
 				}
 
+				if (!Globals::bStartedListening) // hm
+				{
+					ImGui::SliderInt("Players required to start the match", &WarmupRequiredPlayerCount, 1, 100);
+				}
+
 				ImGui::Text(std::format("Joinable {}", Globals::bStartedListening).c_str());
 
 				static std::string ConsoleCommand;
@@ -1412,6 +1418,8 @@ static inline void PregameUI()
 
 		ImGui::SliderInt("Seconds until load into map", &SecondsUntilTravel, 1, 100);
 	}
+
+	ImGui::SliderInt("Players required to start the match", &WarmupRequiredPlayerCount, 1, 100);
 		
 	if (!Globals::bCreative)
 		ImGui::InputText("Playlist", &PlaylistName);