diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 882a87b..cd7a690 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="416ee341-7c52-4323-b6a7-10457ddaee1a" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/app/Http/Controllers/Kajki/EmailController.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/Mail/SendJobMail.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resources/views/emails/JobMail.blade.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Kajki/JobController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Kajki/JobController.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/resources/views/jobs/show.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/jobs/show.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -204,7 +200,7 @@
       <workItem from="1574319521459" duration="17000" />
       <workItem from="1574434761116" duration="5616000" />
       <workItem from="1574513958954" duration="21237000" />
-      <workItem from="1574607279456" duration="4634000" />
+      <workItem from="1574607279456" duration="10473000" />
     </task>
     <servers />
   </component>
@@ -232,7 +228,7 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="php">
           <url>file://$PROJECT_DIR$/resources/views/jobs/show.blade.php</url>
-          <line>178</line>
+          <line>188</line>
           <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
diff --git a/app/Http/Controllers/Kajki/JobController.php b/app/Http/Controllers/Kajki/JobController.php
index d5d3dab..8275935 100644
--- a/app/Http/Controllers/Kajki/JobController.php
+++ b/app/Http/Controllers/Kajki/JobController.php
@@ -34,7 +34,37 @@ public function index()
 
     public function show($id, Job $job)
     {
-        return view('jobs.show', compact('job'));
+        $data = [];
+        //Jobs Base on Category
+        $jobsByCats = Job::latest()
+            ->where('category_id', $job->category_id)
+            ->where('status', 1)
+            ->whereDate('last_date', '>', date('Y-m-d'))
+            ->where('id', '!=', $job->id)
+            ->limit(3)
+            ->get();
+        array_push($data, $jobsByCats);
+        //Jobs Base on Company
+        $jobsByComps = Job::latest()
+            ->where('company_id', $job->company_id)
+            ->where('status', 1)
+            ->whereDate('last_date', '>', date('Y-m-d'))
+            ->where('id', '!=', $job->id)
+            ->limit(3)
+            ->get();
+        array_push($data, $jobsByComps);
+
+        //Jobs Base on Positions
+        $jobsByPosition = Job::latest()
+            ->where('position', 'LIKE', '%' . $job->position . '%')
+            ->where('status', 1)
+            ->whereDate('last_date', '>', date('Y-m-d'))
+            ->where('id', '!=', $job->id)
+            ->limit(3)
+            ->get();
+        array_push($data, $jobsByPosition);
+//        dd($data);
+        return view('jobs.show', compact('job','jobsByComps','jobsByCats'));
     }
 
     public function create()
@@ -156,7 +186,7 @@ public function allJobs(Request $request)
                 ->where('title', 'LIKE', '%' . $keyword . '%')
                 ->orWhere('job_type', $job_type)
                 ->orWhere('category_id', $category_id)
-                ->orWhere('address','LIKE','%'.$address.'%' )
+                ->orWhere('address', 'LIKE', '%' . $address . '%')
                 ->paginate(10);
             return view('jobs.allJobs', compact('allJobs'));
         } else {
diff --git a/resources/views/jobs/show.blade.php b/resources/views/jobs/show.blade.php
index b2ee0a9..e20d690 100644
--- a/resources/views/jobs/show.blade.php
+++ b/resources/views/jobs/show.blade.php
@@ -104,7 +104,17 @@ class="img-fluid
                                             class="btn btn-primary  py-2 px-4">Visit Company Page</a></p>
                     </div>
                 </div>
-
+                @foreach($jobsByCats as $jobData)
+                    <div class="card col-lg-3 col-md-12 mr-5">
+                        <div class="card-body">
+                            <p class="badge badge-info">{{$jobData->job_type}}</p>
+                            <h5 class="card-title">{{$jobData->position}}</h5>
+                            <p class="card-text">{{Str::limit($jobData->description,90)}}</p>
+                            <a href="{{route('jobs.show',[$jobData->id,$jobData->slug])}}" class="btn
+                            btn-primary">Apply</a>
+                        </div>
+                    </div>
+                @endforeach
             </div>
         </div>
     </div>