diff --git a/src/game/features/recovery/Heist/ApartmentHeist.cpp b/src/game/features/recovery/Heist/ApartmentHeist.cpp
index bcd0ed7..94e17f1 100644
--- a/src/game/features/recovery/Heist/ApartmentHeist.cpp
+++ b/src/game/features/recovery/Heist/ApartmentHeist.cpp
@@ -94,6 +94,20 @@ namespace YimMenu::Features
 			}
 		};
 
+		class SkipSwiping : public Command
+		{
+			using Command::Command;
+
+			virtual void OnCall() override
+			{
+				if (auto thread = Scripts::FindScriptThread("fm_mission_controller"_J))
+				{
+					*ScriptLocal(thread, 32616).As<int*>() = 8;
+					*ScriptLocal(thread, 63640).As<int*>() = 5;
+				}
+			}
+		};
+
 		class InstantFinish : public Command
 		{
 			using Command::Command;
@@ -139,6 +153,7 @@ namespace YimMenu::Features
 		static Setup _ApartmentHeistSetup{"apartmentheistsetup", "Setup", "Sets up current apartment heist"};
 		static SkipHacking _ApartmentHeistSkipHacking{"apartmentheistskiphacking", "Skip Hacking", "Skips hacking process"};
 		static SkipDrilling _ApartmentHeistSkipDrilling{"apartmentheistskipdrilling", "Skip Drilling", "Skips drilling process"};
+		static SkipSwiping _ApartmentHeistSkipSwiping{"apartmentheistskipswiping", "Skip Swiping", "Skips card swiping process"};
 		static InstantFinish _ApartmentHeistInstantFinish{"apartmentheistinstantfinish", "Instant Finish", "Instantly passes the heist"};
 		static InstantFinishPacific _ApartmentHeistInstantFinishPacific{"apartmentheistinstantfinishpacific", "Instant Finish (Pacific)", "Instantly passes Pacific Standard Job"};
 	}
diff --git a/src/game/features/recovery/Heist/DiamondCasinoHeist.cpp b/src/game/features/recovery/Heist/DiamondCasinoHeist.cpp
index 029c36d..0f3d5e8 100644
--- a/src/game/features/recovery/Heist/DiamondCasinoHeist.cpp
+++ b/src/game/features/recovery/Heist/DiamondCasinoHeist.cpp
@@ -331,6 +331,20 @@ namespace YimMenu::Features
 			}
 		};
 
+		class SoloMantrap : public Command
+		{
+			using Command::Command;
+
+			virtual void OnCall() override
+			{
+				if (auto thread = Scripts::FindScriptThread("fm_mission_controller"_J))
+				{
+					*ScriptLocal(thread, 32616).As<int*>() = 8;
+					*ScriptLocal(thread, 63640).As<int*>() = 5;
+				}
+			}
+		};
+
 		class InstantFinish : public Command
 		{
 			using Command::Command;
@@ -359,6 +373,7 @@ namespace YimMenu::Features
 		static SetActualTake _DiamondCasinoHeistSetActualTake{"diamondcasinoheistsetactualtake", "Set Actual Take", "Updates actual take"};
 		static SkipHacking _DiamondCasinoHeistSkipHacking{"diamondcasinoheistskiphacking", "Skip Hacking", "Skips hacking process"};
 		static SkipDrilling _DiamondCasinoHeistSkipDrilling{"diamondcasinoheistskipdrilling", "Skip Drilling", "Skips drilling process"};
+		static SoloMantrap _DiamondCasinoHeistSoloMantrap{"diamondcasinoheistsolomantrap", "Solo Mantrap", "Skips card swiping process"};
 		static InstantFinish _DiamondCasinoHeistInstantFinish{"diamondcasinoheistinstantfinish", "Instant Finish", "Instantly passes the heist"};
 	}
 }
\ No newline at end of file
diff --git a/src/game/frontend/submenus/Recovery/Heist/ApartmentHeist.cpp b/src/game/frontend/submenus/Recovery/Heist/ApartmentHeist.cpp
index 309cddd..f3c487e 100644
--- a/src/game/frontend/submenus/Recovery/Heist/ApartmentHeist.cpp
+++ b/src/game/frontend/submenus/Recovery/Heist/ApartmentHeist.cpp
@@ -21,6 +21,7 @@ namespace YimMenu::Submenus
 
 		misc->AddItem(std::make_shared<CommandItem>("apartmentheistskiphacking"_J));
 		misc->AddItem(std::make_shared<CommandItem>("apartmentheistskipdrilling"_J));
+		misc->AddItem(std::make_shared<CommandItem>("apartmentheistskipswiping"_J));
 		misc->AddItem(std::make_shared<CommandItem>("apartmentheistinstantfinish"_J));
 		misc->AddItem(std::make_shared<CommandItem>("apartmentheistinstantfinishpacific"_J));
 
diff --git a/src/game/frontend/submenus/Recovery/Heist/DiamondCasinoHeist.cpp b/src/game/frontend/submenus/Recovery/Heist/DiamondCasinoHeist.cpp
index 484c2aa..2f9e7dc 100644
--- a/src/game/frontend/submenus/Recovery/Heist/DiamondCasinoHeist.cpp
+++ b/src/game/frontend/submenus/Recovery/Heist/DiamondCasinoHeist.cpp
@@ -38,6 +38,7 @@ namespace YimMenu::Submenus
 
 		misc->AddItem(std::make_shared<CommandItem>("diamondcasinoheistskiphacking"_J));
 		misc->AddItem(std::make_shared<CommandItem>("diamondcasinoheistskipdrilling"_J));
+		misc->AddItem(std::make_shared<CommandItem>("diamondcasinoheistsolomantrap"_J));
 		misc->AddItem(std::make_shared<CommandItem>("diamondcasinoheistinstantfinish"_J));
 
 		tab->AddItem(cuts);