diff --git a/supabase/migrations/20250101000003_fix_upsert_and_rls.sql b/supabase/migrations/20250101000003_fix_upsert_and_rls.sql
deleted file mode 100644
index f3b7595..0000000
--- a/supabase/migrations/20250101000003_fix_upsert_and_rls.sql
+++ /dev/null
@@ -1,114 +0,0 @@
--- Fix upsert function and RLS permissions
--- Run this to fix the ON CONFLICT error and 403 permission error
-
--- 1. Fix the upsert function to not use ON CONFLICT
-create or replace function medreport.upsert_benefit_distribution_schedule(
-    p_company_id uuid,
-    p_benefit_amount numeric,
-    p_benefit_occurrence text
-)
-returns void
-language plpgsql
-as $$
-declare
-    next_distribution_date timestamp with time zone;
-    existing_record_id uuid;
-begin
-    -- Calculate next distribution date
-    next_distribution_date := medreport.calculate_next_distribution_date(p_benefit_occurrence);
-    
-    -- Check if there's an existing record for this company
-    select id into existing_record_id
-    from medreport.benefit_distribution_schedule
-    where company_id = p_company_id
-    limit 1;
-    
-    if existing_record_id is not null then
-        -- Update existing record
-        update medreport.benefit_distribution_schedule
-        set 
-            benefit_amount = p_benefit_amount,
-            benefit_occurrence = p_benefit_occurrence,
-            next_distribution_at = next_distribution_date,
-            is_active = true,
-            updated_at = now()
-        where id = existing_record_id;
-    else
-        -- Insert new record
-        insert into medreport.benefit_distribution_schedule (
-            company_id,
-            benefit_amount,
-            benefit_occurrence,
-            next_distribution_at
-        ) values (
-            p_company_id,
-            p_benefit_amount,
-            p_benefit_occurrence,
-            next_distribution_date
-        );
-    end if;
-end;
-$$;
-
--- 2. Add RLS policy for authenticated users to read distribution schedules
-create policy "Users can view distribution schedules for their companies"
-    on "medreport"."benefit_distribution_schedule"
-    for select
-    to authenticated
-    using (
-        company_id in (
-            select account_id 
-            from medreport.accounts_memberships 
-            where user_id = auth.uid()
-        )
-    );
-
--- 3. Grant permissions to authenticated users
-grant select, insert, update, delete on table "medreport"."benefit_distribution_schedule" to authenticated;
-
--- 4. Grant execute permissions to all functions
-grant execute on function medreport.get_account_balance(uuid) to authenticated;
-grant execute on function medreport.distribute_health_benefits(uuid, numeric, text) to authenticated;
-grant execute on function medreport.consume_account_balance(uuid, numeric, text, text) to authenticated;
-grant execute on function medreport.upsert_benefit_distribution_schedule(uuid, numeric, text) to authenticated;
-grant execute on function medreport.calculate_next_distribution_date(text, timestamp with time zone) to authenticated;
-grant execute on function medreport.trigger_benefit_distribution(uuid) to authenticated;
-grant execute on function medreport.trigger_distribute_benefits() to authenticated;
-grant execute on function medreport.process_periodic_benefit_distributions() to authenticated;
-
--- 5. Ensure trigger function has security definer
-create or replace function medreport.trigger_distribute_benefits()
-returns trigger
-language plpgsql
-security definer
-as $$
-begin
-    -- Only distribute if benefit_amount is set and greater than 0
-    if new.benefit_amount is not null and new.benefit_amount > 0 then
-        -- Distribute benefits to all company members immediately
-        perform medreport.distribute_health_benefits(
-            new.account_id,
-            new.benefit_amount,
-            coalesce(new.benefit_occurance, 'yearly')
-        );
-        
-        -- Create or update the distribution schedule for future distributions
-        perform medreport.upsert_benefit_distribution_schedule(
-            new.account_id,
-            new.benefit_amount,
-            coalesce(new.benefit_occurance, 'yearly')
-        );
-    else
-        -- If benefit_amount is 0 or null, deactivate the schedule
-        update medreport.benefit_distribution_schedule
-        set is_active = false, updated_at = now()
-        where company_id = new.account_id;
-    end if;
-    
-    return new;
-end;
-$$;
-
--- 6. Grant execute permission to the updated trigger function
-grant execute on function medreport.trigger_distribute_benefits() to authenticated, service_role;
-
diff --git a/supabase/migrations/20250923162326_analysis_response_elements_fix.sql b/supabase/migrations/20250923162326_analysis_response_elements_fix.sql
index cd82c5b..219895d 100644
--- a/supabase/migrations/20250923162326_analysis_response_elements_fix.sql
+++ b/supabase/migrations/20250923162326_analysis_response_elements_fix.sql
@@ -1,7 +1,7 @@
 -- Drop existing constraint and index for analysis_response_elements
-DROP INDEX IF EXISTS "medreport"."analysis_response_elements_unique_by_response_and_element";
 ALTER TABLE "medreport"."analysis_response_elements" 
 DROP CONSTRAINT IF EXISTS "analysis_response_elements_unique_by_response_and_element";
+DROP INDEX IF EXISTS "medreport"."analysis_response_elements_unique_by_response_and_element";
 
 -- Create proper unique constraint that works with ON CONFLICT
 ALTER TABLE "medreport"."analysis_response_elements" 
diff --git a/supabase/migrations/20250101000000_create_account_balance_entries.sql b/supabase/migrations/20250924145250_create_account_balance_entries.sql
similarity index 100%
rename from supabase/migrations/20250101000000_create_account_balance_entries.sql
rename to supabase/migrations/20250924145250_create_account_balance_entries.sql
diff --git a/supabase/migrations/20250101000001_fix_benefit_distribution_trigger.sql b/supabase/migrations/20250924145251_fix_benefit_distribution_trigger.sql
similarity index 100%
rename from supabase/migrations/20250101000001_fix_benefit_distribution_trigger.sql
rename to supabase/migrations/20250924145251_fix_benefit_distribution_trigger.sql
diff --git a/supabase/migrations/20250101000002_fix_permissions.sql b/supabase/migrations/20250924145252_fix_permissions.sql
similarity index 100%
rename from supabase/migrations/20250101000002_fix_permissions.sql
rename to supabase/migrations/20250924145252_fix_permissions.sql
diff --git a/supabase/migrations/20250924145253_fix_upsert_and_rls.sql b/supabase/migrations/20250924145253_fix_upsert_and_rls.sql
new file mode 100644
index 0000000..b03c9c0
--- /dev/null
+++ b/supabase/migrations/20250924145253_fix_upsert_and_rls.sql
@@ -0,0 +1,54 @@
+-- Fix upsert function and RLS permissions
+-- Run this to fix the ON CONFLICT error and 403 permission error
+
+-- 1. Fix the upsert function to not use ON CONFLICT
+create or replace function medreport.upsert_benefit_distribution_schedule(
+    p_company_id uuid,
+    p_benefit_amount numeric,
+    p_benefit_occurrence text
+)
+returns void
+language plpgsql
+as $$
+declare
+    next_distribution_date timestamp with time zone;
+    existing_record_id uuid;
+begin
+    -- Calculate next distribution date
+    next_distribution_date := medreport.calculate_next_distribution_date(p_benefit_occurrence);
+    
+    -- Check if there's an existing record for this company
+    select id into existing_record_id
+    from medreport.benefit_distribution_schedule
+    where company_id = p_company_id
+    limit 1;
+    
+    if existing_record_id is not null then
+        -- Update existing record
+        update medreport.benefit_distribution_schedule
+        set 
+            benefit_amount = p_benefit_amount,
+            benefit_occurrence = p_benefit_occurrence,
+            next_distribution_at = next_distribution_date,
+            is_active = true,
+            updated_at = now()
+        where id = existing_record_id;
+    else
+        -- Insert new record
+        insert into medreport.benefit_distribution_schedule (
+            company_id,
+            benefit_amount,
+            benefit_occurrence,
+            next_distribution_at
+        ) values (
+            p_company_id,
+            p_benefit_amount,
+            p_benefit_occurrence,
+            next_distribution_date
+        );
+    end if;
+end;
+$$;
+
+-- 2. Grant permissions to authenticated users
+grant select, insert, update, delete on table "medreport"."benefit_distribution_schedule" to authenticated;