diff --git a/src/CourseRegistrationStarter/Main.java b/src/CourseRegistrationStarter/Main.java
index 8f06373..a53a683 100644
--- a/src/CourseRegistrationStarter/Main.java
+++ b/src/CourseRegistrationStarter/Main.java
@@ -4,11 +4,26 @@ public class Main {
     public static void main(String[] args) {
         // TODO:
         // 1. Create at least 3 courses
+        Course AdvancedProgramming = new Course("Advanced Programming","123",2);
+        Course DataStructures = new Course("Data Structures","456",3);
+        Course DatabaseSystems = new Course("Database Systems","789",2);
         // 2. Create 1 student
+        Student Hadi = new Student("Hadi","40033037");
         // 3. Create a registration system
+        RegistrationSystem CS = new RegistrationSystem();
         // 4. Add courses to the system
+        CS.addCourseToSystem(AdvancedProgramming);
+        CS.addCourseToSystem(DataStructures);
+        CS.addCourseToSystem(DatabaseSystems);
         // 5. Register the student in some courses
+        Hadi.addCourse(DataStructures);
+        Hadi.addCourse(DatabaseSystems);
+        Hadi.addCourse(AdvancedProgramming);
         // 6. Drop one course
+        Hadi.dropCourse(DataStructures);
         // 7. Print the final registered course list
+        Hadi.showRegisteredCourses();
+        CS.showAllCourses();
+
     }
 }
diff --git a/src/CourseRegistrationStarter/RegistrationSystem.java b/src/CourseRegistrationStarter/RegistrationSystem.java
index 8b7fe46..165bc5d 100644
--- a/src/CourseRegistrationStarter/RegistrationSystem.java
+++ b/src/CourseRegistrationStarter/RegistrationSystem.java
@@ -28,7 +28,7 @@ public class RegistrationSystem {
 
     public void showAllCourses() {
         for (Course c : courses) {
-            System.out.println(c);
+            System.out.println(c.getCourseName()+" "+c.getCourseCode()+" "+c.getCapacity());
         }
     }
     public Course findCourseByName(String name) {
diff --git a/src/CourseRegistrationStarter/Student.java b/src/CourseRegistrationStarter/Student.java
index 6ffdc9a..5a0ca75 100644
--- a/src/CourseRegistrationStarter/Student.java
+++ b/src/CourseRegistrationStarter/Student.java
@@ -42,7 +42,7 @@ public class Student {
 
     public void showRegisteredCourses() {
         for (Course c : registeredCourses) {
-            System.out.println(c);
+            System.out.println(c.getCourseName()+" "+c.getCourseCode());
         }
     }
 }
\ No newline at end of file