diff --git a/MechFabrik/Mech.puml b/MechFabrik/Mech.puml
deleted file mode 100644
index 32a927a..0000000
--- a/MechFabrik/Mech.puml
+++ /dev/null
@@ -1,33 +0,0 @@
-@startuml
-'https://plantuml.com/object-diagram
-
-object Mech <<Mech>>
-object InnerStructure <<InnerStructure>>
-object Gyroskope <<Gyroskope>>
-object Head <<Area>>
-object Cockpit <<Cockpit>>
-object Reaktor <<Reaktor>>
-object TorsoMiddle <<Area>>
-object TorsoLeft <<Area>>
-object ArmLeft <<Area>>
-object LegLeft <<Area>>
-object TorsoRight <<Area>>
-object ArmRight <<Area>>
-object LegRight <<Area>>
-
-Mech -- InnerStructure
-InnerStructure -- Head
-InnerStructure -- TorsoMiddle
-Mech - Gyroskope
-Head - Cockpit
-Mech - Reaktor
-Gyroskope .. InnerStructure
-Reaktor ... TorsoMiddle
-TorsoMiddle -- TorsoLeft
-TorsoMiddle -- TorsoRight
-TorsoLeft --  ArmLeft
-TorsoLeft --  LegLeft
-TorsoRight -- ArmRight
-TorsoRight -- LegRight
-
-@enduml
diff --git a/MechFabrik/Uml/Mech.puml b/MechFabrik/Uml/Mech.puml
new file mode 100644
index 0000000..d7bfb94
--- /dev/null
+++ b/MechFabrik/Uml/Mech.puml
@@ -0,0 +1,79 @@
+@startuml
+'https://plantuml.com/object-diagram
+
+object Mech <<Mech>> {
+    heater: x
+}
+object InnerStructure <<InnerStructure>>
+object Gyroskope <<Gyroskope>>
+object Sustainment
+object Sensors
+object Head <<Area>> {
+    item_lines: 6
+    amor: #
+}
+object Cockpit <<Cockpit>>
+object Reaktor <<Reaktor>>
+object TorsoMiddle <<Area>> {
+    item_lines: 12
+    amor: #
+}
+object TorsoLeft <<Area>> {
+    item_lines: 12
+    amor: #
+}
+object ArmLeft <<Area>> {
+    item_lines: 12
+    amor: #
+}
+object LegLeft <<Area>> {
+    item_lines: 6
+    amor: #
+}
+object TorsoRight <<Area>> {
+    item_lines: 12
+    amor: #
+}
+object ArmRight <<Area>> {
+    item_lines: 12
+    amor: #
+}
+object LegRight <<Area>> {
+    item_lines: 6
+    amor: #
+}
+object JointAL as "Joint"
+object ActivatorAL as "Activator"
+object JointLL as "Joint"
+object ActivatorLL as "Activator"
+object JointAR as "Joint"
+object ActivatorAR as "Activator"
+object JointLR as "Joint"
+object ActivatorLR as "Activator"
+
+Mech *-- InnerStructure
+InnerStructure *-- Head
+InnerStructure *-- TorsoMiddle
+Mech *- Gyroskope
+Head *- Cockpit
+Head *-- Sustainment
+Head *-- Sensors
+Mech *- Reaktor
+Gyroskope .. InnerStructure
+Reaktor ... InnerStructure
+TorsoMiddle *-- TorsoLeft
+TorsoMiddle *-- TorsoRight
+TorsoLeft *--  ArmLeft
+TorsoLeft *--  LegLeft
+TorsoRight *-- ArmRight
+TorsoRight *-- LegRight
+ArmLeft *--   JointAL
+ArmLeft *--  ActivatorAL
+ArmRight *--   JointAR
+ArmRight *--  ActivatorAR
+LegRight *--   JointLR
+LegRight *--  ActivatorLR
+LegLeft *--   JointLL
+LegLeft *--  ActivatorLL
+
+@enduml