diff --git a/models/advtrains_engine_japan.b3d b/models/advtrains_engine_japan.b3d
new file mode 100644
index 0000000..5b97349
Binary files /dev/null and b/models/advtrains_engine_japan.b3d differ
diff --git a/models/advtrains_wagon_japan.b3d b/models/advtrains_wagon_japan.b3d
new file mode 100644
index 0000000..9e5ac52
Binary files /dev/null and b/models/advtrains_wagon_japan.b3d differ
diff --git a/models/blender/mbb/advtrains_wagon_japan.xcf b/models/blender/mbb/advtrains_wagon_japan.xcf
new file mode 100644
index 0000000..4fc88c0
Binary files /dev/null and b/models/blender/mbb/advtrains_wagon_japan.xcf differ
diff --git a/models/blender/mbb/modern_japanlocomotive.blend b/models/blender/mbb/modern_japanlocomotive.blend
new file mode 100644
index 0000000..f0b2714
Binary files /dev/null and b/models/blender/mbb/modern_japanlocomotive.blend differ
diff --git a/models/blender/mbb/modern_japanlocomotive.blend1 b/models/blender/mbb/modern_japanlocomotive.blend1
new file mode 100644
index 0000000..4f75626
Binary files /dev/null and b/models/blender/mbb/modern_japanlocomotive.blend1 differ
diff --git a/models/blender/mbb/modern_japanlocomotive.png b/models/blender/mbb/modern_japanlocomotive.png
new file mode 100644
index 0000000..b80d16f
Binary files /dev/null and b/models/blender/mbb/modern_japanlocomotive.png differ
diff --git a/models/blender/mbb/modern_japanlocomotive.xcf b/models/blender/mbb/modern_japanlocomotive.xcf
new file mode 100644
index 0000000..bb28534
Binary files /dev/null and b/models/blender/mbb/modern_japanlocomotive.xcf differ
diff --git a/models/blender/mbb/modern_wagong_uv.png b/models/blender/mbb/modern_wagong_uv.png
new file mode 100644
index 0000000..68018ea
Binary files /dev/null and b/models/blender/mbb/modern_wagong_uv.png differ
diff --git a/models/blender/mbb/tr-logo.png b/models/blender/mbb/tr-logo.png
new file mode 100644
index 0000000..9bc0f10
Binary files /dev/null and b/models/blender/mbb/tr-logo.png differ
diff --git a/textures/advtrains_engine_japan.png b/textures/advtrains_engine_japan.png
new file mode 100644
index 0000000..b286b38
Binary files /dev/null and b/textures/advtrains_engine_japan.png differ
diff --git a/textures/advtrains_wagon_japan.png b/textures/advtrains_wagon_japan.png
new file mode 100644
index 0000000..bee565e
Binary files /dev/null and b/textures/advtrains_wagon_japan.png differ
diff --git a/wagons.lua b/wagons.lua
index 540a882..47d7aae 100644
--- a/wagons.lua
+++ b/wagons.lua
@@ -445,7 +445,33 @@ advtrains.register_wagon("wagon_default", "steam",{
 	drops={"default:steelblock 4"},
 }, "Passenger Wagon", "advtrains_wagon_inv.png")
 
-advtrains.register_train_type("subway", {"regular", "default"})
+advtrains.register_train_type("electric", {"default"})
+
+advtrains.register_wagon("engine_japan", "electric",{
+	mesh="advtrains_engine_japan.b3d",
+	textures = {"advtrains_engine_japan.png"},
+	attach_offset={x=0, y=10, z=10},
+	view_offset={x=0, y=6, z=0},
+	visual_size = {x=1, y=1},
+	wagon_span=2,
+	is_locomotive=true,
+	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
+	drops={"default:steelblock 4"},
+}, "Japanese Train Engine", "green.png")
+
+advtrains.register_wagon("wagon_japan", "electric",{
+	mesh="advtrains_wagon_japan.b3d",
+	textures = {"advtrains_wagon_japan.png"},
+	attach_offset={x=0, y=10, z=10},
+	view_offset={x=0, y=6, z=0},
+	visual_size = {x=1, y=1},
+	wagon_span=2,
+	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
+	drops={"default:steelblock 4"},
+}, "Japanese Train Wagon", "blue.png")
+
+
+advtrains.register_train_type("subway", {"default"})
 
 advtrains.register_wagon("subway_wagon", "subway",{
 	mesh="advtrains_subway_train.b3d",