Convoy mods

Convoy mods for 1.42