diff --git a/changelog.txt b/changelog.txt
index 6f19699..7022136 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -4,6 +4,12 @@ Date: ????
   Changes:
     - Allow the construction zone extender mk01, roboport mk01, and charging station to be used in the upgrade planner with each other
     - Updated advanced fluid wagon pump connections to more accurately fit the graphics. Resolves https://github.com/pyanodon/pybugreports/issues/1532
+    - Removed speed cap on advanced locomotive, cargo wagon, and fluid wagon
+    - Increased advanced locomotive braking force from 12 to 18
+    - Increased advanced cargo wagon and fluid wagon weight to 600 and 500 to 700
+    - Decreased advanced cargo wagon and fluid wagon friction by from 0.5 to 0.4
+    - Increased advanced cargo wagon and fluid wagon air resistance from 0.0085 to 0.011
+    - Adjusted advanced cargo wagon and fluid wagon braking force from 15 and 4 to 8
     - Fixed misaligned pipe connection graphics. Resolves https://github.com/pyanodon/pybugreports/issues/1540
 ---------------------------------------------------------------------------------------------------
 Version: 3.1.2
diff --git a/prototypes/buildings/mk02-cargo-wagon.lua b/prototypes/buildings/mk02-cargo-wagon.lua
index 9b16dd0..ad16204 100644
--- a/prototypes/buildings/mk02-cargo-wagon.lua
+++ b/prototypes/buildings/mk02-cargo-wagon.lua
@@ -45,11 +45,10 @@ ENTITY {
   --damaged_trigger_effect = hit_effects.entity(),
   vertical_selection_shift = -0.7,
   fast_replaceable_group = "cargo-wagon",
-  weight = 600,
-  max_speed = 1.5,
-  braking_force = 15,
-  friction_force = 0.50,
-  air_resistance = 0.0085,
+  weight = 700,
+  braking_force = 8,
+  friction_force = 0.40,
+  air_resistance = 0.0110,
   connection_distance = 2,
   joint_distance = 1.5,                             -- igual to collision box works if the sprite is tight in the png
   energy_per_hit_point = 5,
diff --git a/prototypes/buildings/mk02-fluid-wagon.lua b/prototypes/buildings/mk02-fluid-wagon.lua
index e23c1bf..beb166a 100644
--- a/prototypes/buildings/mk02-fluid-wagon.lua
+++ b/prototypes/buildings/mk02-fluid-wagon.lua
@@ -45,11 +45,10 @@ ENTITY {
     --damaged_trigger_effect = hit_effects.entity(),
     vertical_selection_shift = -0.7,
     fast_replaceable_group = "fluid-wagon",
-    weight = 500,
-    max_speed = 1.5,
-    braking_force = 4,
-    friction_force = 0.50,
-    air_resistance = 0.0085,
+    weight = 700,
+    braking_force = 8,
+    friction_force = 0.40,
+    air_resistance = 0.0110,
     connection_distance = 2,
     joint_distance = 1.5, --igual to collision box works if the sprite is tight in the png
     tank_count = 2,
diff --git a/prototypes/buildings/mk02-locomotive.lua b/prototypes/buildings/mk02-locomotive.lua
index c2245f3..81c0942 100644
--- a/prototypes/buildings/mk02-locomotive.lua
+++ b/prototypes/buildings/mk02-locomotive.lua
@@ -50,10 +50,9 @@ ENTITY {
     alert_icon_shift = util.by_pixel(0, -24),
     fast_replaceable_group = "locomotive",
     weight = 1600,
-    max_speed = 1.30,
     max_power = "900kW",
     reversing_power_modifier = 0.6,
-    braking_force = 12,
+    braking_force = 18,
     friction_force = 0.40,
     vertical_selection_shift = -0.7,
     air_resistance = 0.0085, -- this is a percentage of current speed that will be subtracted