diff --git a/BigBaseV2/src/backend/looped/vehicle/drive_on_water.cpp b/BigBaseV2/src/backend/looped/vehicle/drive_on_water.cpp
index 2091cf45..22c01e45 100644
--- a/BigBaseV2/src/backend/looped/vehicle/drive_on_water.cpp
+++ b/BigBaseV2/src/backend/looped/vehicle/drive_on_water.cpp
@@ -5,61 +5,89 @@
 
 namespace big
 {
-	void looped::vehicle_drive_on_water()
+	constexpr auto drive_on_water_surface_hash = RAGE_JOAAT("stt_prop_stunt_bblock_xl3");
+	static Vector3 drive_on_water_last_loc;
+
+	void drive_on_water_hide_surface()
 	{
-		if (g->vehicle.drive_on_water) {
+		Object surface = OBJECT::GET_CLOSEST_OBJECT_OF_TYPE(
+			drive_on_water_last_loc.x, drive_on_water_last_loc.y, drive_on_water_last_loc.z, 
+			4.0, drive_on_water_surface_hash, 0, 0, 1
+		);
 
-			Vector3 location = self::pos;
-			Vehicle vehicle = self::veh;
-			Player player = self::id;
-			Ped playerPed = self::ped;
-			DWORD model = ENTITY::GET_ENTITY_MODEL(vehicle);
-			Hash hash = MISC::GET_HASH_KEY("prop_container_ld2");
-			float height = 0;
-
-			WATER::SET_DEEP_OCEAN_SCALER(height);
-			if ((!(VEHICLE::IS_THIS_MODEL_A_PLANE(model))) && WATER::GET_WATER_HEIGHT_NO_WAVES(location.x, location.y, location.z, &height)) {
-				Object container = OBJECT::GET_CLOSEST_OBJECT_OF_TYPE(location.x, location.y, location.z, 4.0, hash, 0, 0, 1);
-				if (ENTITY::DOES_ENTITY_EXIST(container) && height > -50.0f) {
-					Vector3 pRot = ENTITY::GET_ENTITY_ROTATION(playerPed, 0);
-					if (PED::IS_PED_IN_ANY_VEHICLE(playerPed, 1)) pRot = ENTITY::GET_ENTITY_ROTATION(vehicle, 0);
-					entity::take_control_of(container);
-					ENTITY::SET_ENTITY_COORDS(container, location.x, location.y, height - 2.5f, 0, 0, 0, 1);
-					ENTITY::SET_ENTITY_ROTATION(container, 0, 0, pRot.z, 0, 1);
-					Vector3 containerCoords = ENTITY::GET_ENTITY_COORDS(container, 1);
-					if (location.z < containerCoords.z) {
-						if (!PED::IS_PED_IN_ANY_VEHICLE(playerPed, 0)) {
-							ENTITY::SET_ENTITY_COORDS(playerPed, location.x, location.y, containerCoords.z + 2.0f, 0, 0, 0, 1);
-						}
-						else {
-							entity::take_control_of(vehicle);
-							Vector3 vehc = ENTITY::GET_ENTITY_COORDS(vehicle, 1);
-							ENTITY::SET_ENTITY_COORDS(vehicle, vehc.x, vehc.y, containerCoords.z + 2.0f, 0, 0, 0, 1);
-						}
-					}
-				}
-				else {
-					Hash model = hash;
-					STREAMING::REQUEST_MODEL(model);
-					while (!STREAMING::HAS_MODEL_LOADED(model)) script::get_current()->yield(0ms);
-					container = OBJECT::CREATE_OBJECT(model, location.x, location.y, location.z, 1, 1, 0);
-					entity::take_control_of(container);
-					ENTITY::FREEZE_ENTITY_POSITION(container, 1);
-					ENTITY::SET_ENTITY_ALPHA(container, 0, 1);
-					ENTITY::SET_ENTITY_VISIBLE(container, false, 0);
-				}
-			}
-			else {
-				Object container = OBJECT::GET_CLOSEST_OBJECT_OF_TYPE(location.x, location.y, location.z, 4.0, hash, 0, 0, 1);
-				if (ENTITY::DOES_ENTITY_EXIST(container)) {
-					entity::take_control_of(container);
-					ENTITY::SET_ENTITY_COORDS(container, 0, 0, -1000.0f, 0, 0, 0, 1);
-					script::get_current()->yield(10ms);
-					ENTITY::SET_ENTITY_AS_NO_LONGER_NEEDED(&container);
-					ENTITY::DELETE_ENTITY(&container);
-					WATER::RESET_DEEP_OCEAN_SCALER();
-				}
-			}
+		if (surface)
+		{
+			entity::take_control_of(surface);
+			ENTITY::SET_ENTITY_COORDS(surface, 0, 0, -1000.0f, 0, 0, 0, 1);
+			script::get_current()->yield(10ms);
+			ENTITY::SET_ENTITY_AS_NO_LONGER_NEEDED(&surface);
+			ENTITY::DELETE_ENTITY(&surface);
+			WATER::RESET_DEEP_OCEAN_SCALER();
 		}
 	}
-}
\ No newline at end of file
+
+
+	void looped::vehicle_drive_on_water()
+	{
+		if (!g->vehicle.drive_on_water || self::veh == 0) {
+			drive_on_water_hide_surface();
+			return;
+		}
+
+		Vector3 location = ENTITY::GET_ENTITY_COORDS(self::veh, 1);
+		float height = 0;
+
+		WATER::SET_DEEP_OCEAN_SCALER(0);
+		if (location.z - height < 10 && WATER::GET_WATER_HEIGHT_NO_WAVES(location.x, location.y, location.z, &height))
+		{
+			Object surface = OBJECT::GET_CLOSEST_OBJECT_OF_TYPE(
+				drive_on_water_last_loc.x, drive_on_water_last_loc.y, drive_on_water_last_loc.z,
+				4.0, drive_on_water_surface_hash, 0, 0, 1
+			);
+
+			if (ENTITY::DOES_ENTITY_EXIST(surface) && height > -50.0f)
+			{
+				entity::take_control_of(surface);
+
+				drive_on_water_last_loc = location;
+				drive_on_water_last_loc.z = height - 0.5f;
+				ENTITY::SET_ENTITY_COORDS(
+					surface, 
+					drive_on_water_last_loc.x, drive_on_water_last_loc.y, drive_on_water_last_loc.z, 
+					0, 0, 0, 0
+				);
+
+				if (location.z < height - 2.f)
+				{
+					entity::take_control_of(self::veh);
+					ENTITY::SET_ENTITY_COORDS(self::veh, location.x, location.y, height, 0, 0, 0, 0);
+				}
+			}
+			else
+			{
+				STREAMING::REQUEST_MODEL(drive_on_water_surface_hash);
+				while (!STREAMING::HAS_MODEL_LOADED(drive_on_water_surface_hash))
+				{
+					script::get_current()->yield();
+				}
+
+				drive_on_water_last_loc = location;
+				drive_on_water_last_loc.z = height - 0.5f;
+				surface = OBJECT::CREATE_OBJECT(
+					drive_on_water_surface_hash, 
+					drive_on_water_last_loc.x, drive_on_water_last_loc.y, drive_on_water_last_loc.z,
+					1, 1, 0
+				);
+
+				entity::take_control_of(surface);
+				ENTITY::FREEZE_ENTITY_POSITION(surface, 1);
+				ENTITY::SET_ENTITY_ALPHA(surface, 0, 1);
+				ENTITY::SET_ENTITY_VISIBLE(surface, false, 0);
+			}
+		}
+		else
+		{
+			drive_on_water_hide_surface();
+		}
+	}
+}