diff --git a/app/Observers/AssetObserver.php b/app/Observers/AssetObserver.php
index fab3b290ca..85e45b082e 100644
--- a/app/Observers/AssetObserver.php
+++ b/app/Observers/AssetObserver.php
@@ -129,7 +129,8 @@ class AssetObserver
         } 
 
        //determine if explicit and set eol_explit to true 
-       if(!is_null($asset->asset_eol_date) && !is_null($asset->purchase_date) || ($asset->isDirty($asset->asset_eol_date) || $asset->isDirty($asset->purchase_date))) { 
+      //conditions might need more work 
+       if(!is_null($asset->asset_eol_date) && !is_null($asset->purchase_date)) { 
             if($asset->model->eol) { 
                 $months = Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date); 
                 if($months != $asset->model->eol) {
diff --git a/database/factories/AssetFactory.php b/database/factories/AssetFactory.php
index 0e0c3931d8..eb1b21358a 100644
--- a/database/factories/AssetFactory.php
+++ b/database/factories/AssetFactory.php
@@ -8,6 +8,7 @@ use App\Models\Location;
 use App\Models\Statuslabel;
 use App\Models\Supplier;
 use App\Models\User;
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class AssetFactory extends Factory
@@ -48,6 +49,17 @@ class AssetFactory extends Factory
             'last_checkout' => null,
         ];
     }
+   
+    
+    public function configure()
+    {
+        return $this->afterMaking(function (Asset $asset) {
+            // $asset->asset_eol_date = Carbon::parse($asset->purchase_date)->addMonths($asset->model->eol)->format('Y-m-d'); 
+            $asset->asset_eol_date = $this->faker->boolean(5) 
+                ? Carbon::parse($asset->purchase_date)->addMonths(rand(0, 20))->format('Y-m-d')
+                : Carbon::parse($asset->purchase_date)->addMonths($asset->model->eol)->format('Y-m-d'); 
+        });
+    } 
 
     public function laptopMbp()
     {
@@ -338,4 +350,5 @@ class AssetFactory extends Factory
     {
         return $this->state(['requestable' => false]);
     }
+   
 }