diff --git a/app/Http/Controllers/CountryController.php b/app/Http/Controllers/CountryController.php
index 2b9be507..2f86a528 100644
--- a/app/Http/Controllers/CountryController.php
+++ b/app/Http/Controllers/CountryController.php
@@ -9,7 +9,7 @@ class CountryController extends Controller
     public function index()
     {
         // TASK: load the relationship average of team size
-        $countries = Country::all();
+        $countries = Country::withAvg('teams as teams_avg_size', 'size')->get();
 
         return view('countries.index', compact('countries'));
     }
diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index e04fb1a6..ed4a0563 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -10,7 +10,10 @@ public function store(Request $request)
     {
         // TASK: Add one sentence to save the project to the logged-in user
         //   by $request->project_id and with $request->start_date parameter
-
+        $user = auth()->user(); 
+        $user->projects()->attach($request->project_id, [
+                                  'start_date' => $request->start_date
+                           ]);
         return 'Success';
     }
 }
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 7ae1d3d6..b97f4a1c 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -8,7 +8,7 @@ class UserController extends Controller
 {
     public function index()
     {
-        $users = User::all();
+        $users = User::has('projects')->get();
 
         return view('users.index', compact('users'));
     }
diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php
index 158b6470..32c47267 100644
--- a/app/Models/Attachment.php
+++ b/app/Models/Attachment.php
@@ -14,5 +14,6 @@ class Attachment extends Model
     public function attachable()
     {
         // TASK: fill in the code to make it work
+         return $this->morphTo();
     }
 }
diff --git a/app/Models/Role.php b/app/Models/Role.php
index c2f3fc89..01c7d71e 100644
--- a/app/Models/Role.php
+++ b/app/Models/Role.php
@@ -14,6 +14,6 @@ class Role extends Model
     public function users()
     {
         // TASK: fix this by adding a parameter
-        return $this->belongsToMany(User::class);
+        return $this->belongsToMany(User::class,'users_roles');
     }
 }
diff --git a/app/Models/Task.php b/app/Models/Task.php
index 01f6912d..ae6fab21 100644
--- a/app/Models/Task.php
+++ b/app/Models/Task.php
@@ -13,6 +13,6 @@ class Task extends Model
 
     public function user()
     {
-        return $this->belongsTo(User::class, 'users_id');
+       return $this->belongsTo(User::class, 'users_id')->withDefault();
     }
 }
diff --git a/app/Models/Team.php b/app/Models/Team.php
index 13969525..cd6a1181 100644
--- a/app/Models/Team.php
+++ b/app/Models/Team.php
@@ -14,7 +14,7 @@ class Team extends Model
     public function users()
     {
         // TASK: fix this by adding some extra code
-        return $this->belongsToMany(User::class);
+        return $this->belongsToMany(User::class,'team_user')->withPivot('position', 'created_at');
     }
 
 }
diff --git a/app/Models/User.php b/app/Models/User.php
index 3d7facd2..a5914ce8 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -45,12 +45,13 @@ class User extends Authenticatable
     public function tasks()
     {
         // TASK: fix this by adding a parameter
-        return $this->hasMany(Task::class);
+        return $this->hasMany(Task::class, 'users_id');
     }
 
     public function comments()
     {
         // TASK: add the code here for two-level relationship
+         return $this->hasManyThrough(Comment::class, Task::class,'users_id' );
     }
 
     public function projects()