diff --git a/django_code/apps/random_simpsons/admin.py b/django_code/apps/random_simpsons/admin.py
index 09ca0c4..21d1ff5 100644
--- a/django_code/apps/random_simpsons/admin.py
+++ b/django_code/apps/random_simpsons/admin.py
@@ -85,18 +85,12 @@ class EpisodeAdmin(ImportExportModelAdmin):
 @admin.register(urlData)
 class urldataAdmin(ImportExportModelAdmin):
     list_display = ('url_example', 'prefix', 'infix', 'suffix','addedDate')
-    #fields = ['url_example', 'prefix', 'infix', 'suffix']
-    
-    #fields = (
-    #    ('prefix', 'infix', 'suffix'),
-    #    'url_example'
-    #)
+
 
     fieldsets = [
     (
         None,
         {
-            "description": ["collapse"],
             'fields': (('prefix', 'infix', 'suffix'), 'url_example')
         },
     )
diff --git a/django_code/apps/random_simpsons/migrations/0008_alter_simpsonsdata_modified_at_alter_urldata_infix_and_more.py b/django_code/apps/random_simpsons/migrations/0008_alter_simpsonsdata_modified_at_alter_urldata_infix_and_more.py
new file mode 100644
index 0000000..a37f010
--- /dev/null
+++ b/django_code/apps/random_simpsons/migrations/0008_alter_simpsonsdata_modified_at_alter_urldata_infix_and_more.py
@@ -0,0 +1,34 @@
+# Generated by Django 4.2.30 on 2026-07-07 09:28
+
+import datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('simpsons', '0007_alter_urldata_infix_alter_urldata_prefix_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='simpsonsdata',
+            name='modified_at',
+            field=models.DateTimeField(default=datetime.datetime(1970, 1, 1, 0, 0, tzinfo=datetime.timezone.utc)),
+        ),
+        migrations.AlterField(
+            model_name='urldata',
+            name='infix',
+            field=models.CharField(blank=True, help_text='&episode=', max_length=1000, null=True),
+        ),
+        migrations.AlterField(
+            model_name='urldata',
+            name='prefix',
+            field=models.CharField(blank=True, help_text='https://www.1shows.org/tv/456-the-simpsons?streaming=true&season=', max_length=1000, null=True),
+        ),
+        migrations.AlterField(
+            model_name='urldata',
+            name='suffix',
+            field=models.CharField(blank=True, max_length=1000, null=True),
+        ),
+    ]
diff --git a/django_code/apps/random_simpsons/models.py b/django_code/apps/random_simpsons/models.py
index ed68901..89eade4 100644
--- a/django_code/apps/random_simpsons/models.py
+++ b/django_code/apps/random_simpsons/models.py
@@ -2,22 +2,23 @@ from django.db import models
 from datetime import datetime
 from django.utils.timezone import make_aware
 
+EPOCH = make_aware(datetime(1970, 1, 1))
 
 class SimpsonsData(models.Model):
     season = models.IntegerField()
     episode  = models.IntegerField()
     url = models.CharField(max_length=1000)
     seen = models.BooleanField()
-    modified_at = models.DateTimeField(default=lambda: make_aware(datetime.fromtimestamp(0)))
+    modified_at = models.DateTimeField(default=EPOCH)
 
     class Meta:
         db_table = 'episodes'
 
 class urlData(models.Model):
     url_example = models.CharField(max_length=1000, help_text="https://www.1shows.org/tv/456-the-simpsons?streaming=true&season=18&episode=5")
-    prefix = models.CharField(max_length=1000, help_text="https://www.1shows.org/tv/456-the-simpsons?streaming=true&season=")
-    infix = models.CharField(max_length=1000, help_text="8&episode=")
-    suffix = models.CharField(max_length=1000, help_text="")
+    prefix = models.CharField(max_length=1000, help_text="https://www.1shows.org/tv/456-the-simpsons?streaming=true&season=",blank=True, null=True)
+    infix = models.CharField(max_length=1000, help_text="&episode=",blank=True, null=True)
+    suffix = models.CharField(max_length=1000, help_text="" ,blank=True, null=True)
     addedDate = models.DateField('Published', blank=True, null=True, auto_now_add=True)
     
     class Meta:
diff --git a/django_code/apps/random_simpsons/utils.py b/django_code/apps/random_simpsons/utils.py
index 24affb3..51f0f77 100644
--- a/django_code/apps/random_simpsons/utils.py
+++ b/django_code/apps/random_simpsons/utils.py
@@ -4,7 +4,7 @@ from celery.worker.state import active_requests
 from requests.compat import str
 from django.utils import timezone
 from apps.betaserie.utils import betaserieUtils
-from .models import simpsons_data_object
+from .models import simpsons_data_object,urlData
 
 betaserie = betaserieUtils()
 
@@ -73,7 +73,9 @@ def generate_new_urls_for_episode(verbose=False):
         for episode in range(1,number_episodes_in_season+1):
             if verbose : print("Season: "+str(season))
             if verbose : print("episode: "+str(episode))
-            new_url = "https://www.1shows.org/tv/456-the-simpsons?streaming=true&season="+str(season)+"&episode="+str(episode)
+
+            new_url_object = urlData.objects.all().order_by('-addedDate').first()
+            new_url = str(new_url_object.prefix)+str(season)+str(new_url_object.infix)+str(episode)+str(new_url_object.suffix)
     
             if verbose : print(new_url)
             try: