diff --git a/src/main/java/org/Main.java b/src/main/java/org/Main.java
index 7551bc6..fb885fe 100644
--- a/src/main/java/org/Main.java
+++ b/src/main/java/org/Main.java
@@ -1,8 +1,8 @@
 package org;
 
-import org.model.Porsche;
-import org.model.Benz;
-import org.model.Audi;
+import org.model.ElectricCar;
+import org.model.GasCar;
+import org.model.SportsCar;
 import org.model.Vehicle;
 import org.service.Serviceable;
 import org.util.VehicleInspector;
@@ -11,11 +11,11 @@ public class Main
 {
     public static void main(String[] args)
     {
-        Porsche porsche = new Porsche("Porsche", "911 Carrera", 2023, 5000, 450);
-        Benz benz = new Benz("Mercedes-Benz", "E-Class", 2022, 10000, 220);
-        Audi audi = new Audi("Audi", "RS5 Sportback", 2021, 8000, 333);
+        ElectricCar porsche = new ElectricCar("Porsche", "Taycan", 2023, 12000, 93.4);
+        GasCar benz = new GasCar("Mercedes-Benz", "C200", 2022, 28000, 2.0);
+        SportsCar audi = new SportsCar("Audi", "R8", 2021, 15000, 570);
 
-        Vehicle[] vehicles = {porsche, benz, audi};
+        Vehicle[] vehicles = { porsche, benz, audi };
 
         for (Vehicle v : vehicles)
         {
@@ -29,7 +29,7 @@ public class Main
             System.out.println();
         }
 
-        Serviceable[] serviceables = {porsche, benz, audi};
+        Serviceable[] serviceables = { porsche, benz, audi };
 
         for (Serviceable s : serviceables)
         {
@@ -44,10 +44,10 @@ public class Main
             {
                 System.out.println(v.getBrand() + " " + v.getModel() + " does not need service.");
             }
+
             System.out.println();
         }
 
-        // TODO 7 (Optional):
         System.out.println("=== Workshop Completed ===");
     }
 }
\ No newline at end of file