diff --git a/README.md b/README.md
index 185acdc..d727cf5 100644
--- a/README.md
+++ b/README.md
@@ -36,15 +36,15 @@ You'll need to install Visual Studio 2019 (v142), [DirectX9 SDK](https://www.mic
 4. [Plugin SDK](https://github.com/DK22Pac/plugin-sdk)
 
 ## Images
-![1](https://raw.githubusercontent.com/user-grinch/user-grinch.github.io/master/assets/img/mods/cheat-menu/teleport.gif)
-![2](https://raw.githubusercontent.com/user-grinch/user-grinch.github.io/master/assets/img/mods/cheat-menu/player.gif)
-![3](https://raw.githubusercontent.com/user-grinch/user-grinch.github.io/master/assets/img/mods/cheat-menu/ped.gif)
-![4](https://raw.githubusercontent.com/user-grinch/user-grinch.github.io/master/assets/img/mods/cheat-menu/animation.gif)
-![5](https://raw.githubusercontent.com/user-grinch/user-grinch.github.io/master/assets/img/mods/cheat-menu/vehicle.gif)
-![6](https://raw.githubusercontent.com/user-grinch/user-grinch.github.io/master/assets/img/mods/cheat-menu/weapon.gif)
-![7](https://raw.githubusercontent.com/user-grinch/user-grinch.github.io/master/assets/img/mods/cheat-menu/game.gif)
-![8](https://raw.githubusercontent.com/user-grinch/user-grinch.github.io/master/assets/img/mods/cheat-menu/visual.gif)
-![9](https://raw.githubusercontent.com/user-grinch/user-grinch.github.io/master/assets/img/mods/cheat-menu/menu.gif)
+![1](https://raw.githubusercontent.com/user-grinch/Cheat-Menu/rewrite/images/teleport.gif)
+![2](https://raw.githubusercontent.com/user-grinch/Cheat-Menu/rewrite/images/player.gif)
+![3](https://raw.githubusercontent.com/user-grinch/Cheat-Menu/rewrite/images/ped.gif)
+![4](https://raw.githubusercontent.com/user-grinch/Cheat-Menu/rewrite/images/animation.gif)
+![5](https://raw.githubusercontent.com/user-grinch/Cheat-Menu/rewrite/images/vehicle.gif)
+![6](https://raw.githubusercontent.com/user-grinch/Cheat-Menu/rewrite/images/weapon.gif)
+![7](https://raw.githubusercontent.com/user-grinch/Cheat-Menu/rewrite/images/game.gif)
+![8](https://raw.githubusercontent.com/user-grinch/Cheat-Menu/rewrite/images/visual.gif)
+![9](https://raw.githubusercontent.com/user-grinch/Cheat-Menu/rewrite/images/menu.gif)
 
 ## Docs 
 
diff --git a/images/animation.gif b/images/animation.gif
new file mode 100644
index 0000000..995c6d4
Binary files /dev/null and b/images/animation.gif differ
diff --git a/images/game.gif b/images/game.gif
new file mode 100644
index 0000000..c28aba6
Binary files /dev/null and b/images/game.gif differ
diff --git a/images/ped.gif b/images/ped.gif
new file mode 100644
index 0000000..152cc37
Binary files /dev/null and b/images/ped.gif differ
diff --git a/images/player.gif b/images/player.gif
new file mode 100644
index 0000000..62c32f3
Binary files /dev/null and b/images/player.gif differ
diff --git a/images/teleport.gif b/images/teleport.gif
new file mode 100644
index 0000000..d93d38f
Binary files /dev/null and b/images/teleport.gif differ
diff --git a/images/vehicle.gif b/images/vehicle.gif
new file mode 100644
index 0000000..014d161
Binary files /dev/null and b/images/vehicle.gif differ
diff --git a/images/visual.gif b/images/visual.gif
new file mode 100644
index 0000000..56b579a
Binary files /dev/null and b/images/visual.gif differ
diff --git a/images/weapon.gif b/images/weapon.gif
new file mode 100644
index 0000000..54975a5
Binary files /dev/null and b/images/weapon.gif differ
diff --git a/src/Teleport.cpp b/src/Teleport.cpp
index 5e8dc0a..4f92aa9 100644
--- a/src/Teleport.cpp
+++ b/src/Teleport.cpp
@@ -128,7 +128,7 @@ void Teleport::TeleportPlayer(bool get_marker, CVector* pos, short interior_id)
 	
 	if (pVeh && player->m_nPedFlags.bInVehicle)
 	{
-		pVeh->Teleport(CVector(pos->x, pos->y, pos->z), false);
+		pVeh->Teleport(STeleport::pos, false);
 
 		if (pVeh->m_nVehicleClass == VEHICLE_BIKE)
 			reinterpret_cast<CBike*>(pVeh)->PlaceOnRoadProperly();
diff --git a/src/Util.cpp b/src/Util.cpp
index 70129a0..db7074e 100644
--- a/src/Util.cpp
+++ b/src/Util.cpp
@@ -8,7 +8,7 @@ void Util::ClearCharTasksVehCheck(CPed* ped)
 	uint hveh = NULL;
 	bool veh_engine = true;
 
-	if (Command<Commands::IS_CHAR_IN_ANY_CAR>(hped))
+	if (ped->m_nPedFlags.bInVehicle)
 	{
 		hveh = CPools::GetVehicleRef(ped->m_pVehicle);
 		veh_engine = ped->m_pVehicle->m_nVehicleFlags.bEngineOn;
diff --git a/src/Vehicle.cpp b/src/Vehicle.cpp
index 11a0023..df3576d 100644
--- a/src/Vehicle.cpp
+++ b/src/Vehicle.cpp
@@ -446,7 +446,7 @@ void Vehicle::SpawnVehicle(std::string &smodel)
 		CVector pos = player->GetPosition();
 		int speed = 0;
 
-		if (Command<Commands::IS_CHAR_IN_ANY_CAR>(hplayer) && spawner::spawn_inside)
+		if (player->m_nPedFlags.bInVehicle && spawner::spawn_inside)
 		{
 			int hveh = 0;
 			Command<Commands::GET_CAR_CHAR_IS_USING>(hplayer, &hveh);
@@ -651,7 +651,7 @@ void Vehicle::Main()
 
 	if (ImGui::Button("Flip vehicle", ImVec2(Ui::GetSize(3))))
 	{
-		if (Command<Commands::IS_CHAR_IN_ANY_CAR>(hplayer))
+		if (player->m_nPedFlags.bInVehicle)
 		{
 			int hveh = CPools::GetVehicleRef(player->m_pVehicle);
 			float roll;