diff --git a/app/Filters/ClientFilters.php b/app/Filters/ClientFilters.php
index 216fbc1404b7..8d5261b8706d 100644
--- a/app/Filters/ClientFilters.php
+++ b/app/Filters/ClientFilters.php
@@ -174,6 +174,7 @@ class ClientFilters extends QueryFilters
          * limit the user to only the invoices they have created
          */
         if (Gate::denies('view-list', Client::class)) {
+            info("the gate!");
             $query->where('clients.user_id', '=', $user->id);
         }
 
@@ -189,7 +190,6 @@ class ClientFilters extends QueryFilters
      */
     public function entityFilter()
     {
-        
         //return $this->builder->whereCompanyId(auth()->user()->company()->id);
         return $this->builder->company();
     }
diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index d2b8acc6e0a4..3894b9328f08 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -131,14 +131,16 @@ class BaseController extends Controller
 
         $query->with($includes);
 
-        if (auth()->user()->cannot('view_'.$this->entity_type)) {
-            if ($this->entity_type == Company::class || $this->entity_type == Design::class) {
-                //no user keys exist on the company table, so we need to skip
-            } elseif ($this->entity_type == User::class) {
-                //$query->where('id', '=', auth()->user()->id); @todo why?
-            } else {
+        if (!auth()->user()->hasPermission('view_'.lcfirst(class_basename($this->entity_type)))) {
+          
+            // if ($this->entity_type == Company::class || $this->entity_type == Design::class) {
+            //     //no user keys exist on the company table, so we need to skip
+            // } elseif ($this->entity_type == User::class) {
+            //     //$query->where('id', '=', auth()->user()->id); @todo why?
+            // } else {
                 $query->where('user_id', '=', auth()->user()->id);
-            }
+           // }
+
         }
 
         if (request()->has('updated_at') && request()->input('updated_at') > 0) {
diff --git a/app/Models/User.php b/app/Models/User.php
index 7b5f07a8fcb5..64b0e11e896b 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -286,7 +286,16 @@ class User extends Authenticatable implements MustVerifyEmail
      */
     public function hasPermission($permission) : bool
     {
-        return (stripos($this->company_user->permissions, $permission) !== false);
+        $parts = explode("_", $permission);
+        $all_permission = '';
+
+        if(count($parts) > 1)
+            $all_permission = $parts[0] . '_all';
+
+        return  $this->isOwner() ||
+                $this->isAdmin() ||
+                (stripos($this->company_user->permissions, $all_permission) !== false) ||
+                (stripos($this->company_user->permissions, $permission) !== false);
     }
 
     public function documents()