diff --git a/models/main_package/core/bronze/streamline/bronze__receipts_fr.sql b/models/main_package/core/bronze/streamline/bronze__receipts_fr.sql
index a575663f..1d506a34 100644
--- a/models/main_package/core/bronze/streamline/bronze__receipts_fr.sql
+++ b/models/main_package/core/bronze/streamline/bronze__receipts_fr.sql
@@ -19,7 +19,14 @@ UNION ALL
 SELECT
     _partition_by_block_id AS partition_key,
     block_number,
-    VALUE :"array_index" :: INT AS array_index,
+    COALESCE(
+          VALUE :"array_index" :: INT,
+          TRY_TO_NUMBER(
+              utils.udf_hex_to_int(
+                  VALUE :"data" :"transactionIndex" :: STRING
+              )
+          )
+      ) AS array_index,
     VALUE,
     DATA,
     metadata,
diff --git a/models/main_package/core/bronze/streamline/bronze__traces_fr_v1.sql b/models/main_package/core/bronze/streamline/bronze__traces_fr_v1.sql
index 426fbe01..d161f0fd 100644
--- a/models/main_package/core/bronze/streamline/bronze__traces_fr_v1.sql
+++ b/models/main_package/core/bronze/streamline/bronze__traces_fr_v1.sql
@@ -1,5 +1,5 @@
 {# Set variables #}
-{% set source_name = 'TRACES' %}
+{% set source_name = 'DEBUG_TRACEBLOCKBYNUMBER' if var('GLOBAL_USES_SINGLE_FLIGHT_METHOD',false) else 'TRACES' %}
 {% set source_version = '' %}
 {% set model_type = 'FR' %}
 
@@ -37,4 +37,4 @@
     balances = balances,
     block_number = block_number,
     uses_receipts_by_hash = uses_receipts_by_hash
-) }}
+) }}
\ No newline at end of file
diff --git a/models/main_package/core/streamline/streamline__blocks.sql b/models/main_package/core/streamline/streamline__blocks.sql
index 9f597dbf..9e56c764 100644
--- a/models/main_package/core/streamline/streamline__blocks.sql
+++ b/models/main_package/core/streamline/streamline__blocks.sql
@@ -16,10 +16,14 @@
 ) }}
 
 SELECT
-    _id AS block_number,
-    utils.udf_int_to_hex(_id) AS block_number_hex
+    _id,
+    (
+        ({{ var('GLOBAL_BLOCKS_PER_HOUR',0) }} / 60) * {{ var('GLOBAL_CHAINHEAD_DELAY',3) }}
+    ) :: INT AS block_number_delay, --minute-based block delay
+    (_id - block_number_delay) :: INT AS block_number,
+    utils.udf_int_to_hex(block_number) AS block_number_hex
 FROM
-    {{ ref('utils__number_sequence') }}
+    {{ ref('silver__number_sequence') }}
 WHERE
     _id <= (
         SELECT
@@ -29,5 +33,4 @@ WHERE
             )
         FROM
             {{ ref("streamline__get_chainhead") }}
-    )
-    and _id > 0
\ No newline at end of file
+    )
\ No newline at end of file
diff --git a/models/sources.yml b/models/sources.yml
index 3b4c147c..990b3a19 100644
--- a/models/sources.yml
+++ b/models/sources.yml
@@ -20,6 +20,7 @@ sources:
       - name: receipts_v2
       - name: traces
       - name: traces_v2
+      - name: debug_traceblockbynumber
       - name: confirm_blocks
       - name: confirm_blocks_v2
       - name: decoded_logs