diff --git a/queries/coingecko/v1/pairs.sql b/queries/coingecko/v1/pairs.sql
index 42fbe41..f2cdec5 100644
--- a/queries/coingecko/v1/pairs.sql
+++ b/queries/coingecko/v1/pairs.sql
@@ -1,39 +1,65 @@
 -- getPairs
-WITH listed AS (
-  SELECT
-    DISTINCT asset_id
-  FROM
-    omnipool_asset
-  WHERE
-    asset_id NOT BETWEEN 100 AND 199
-  UNION SELECT 10
-  UNION SELECT 22
+with router_24h as (
+    select
+        cast(args ->> 'assetIn' as integer) as asset_in,
+        cast(args ->> 'assetOut' as integer) as asset_out,
+        row_number() over (partition by args ->> 'assetIn', args ->> 'assetOut' order by timestamp desc) rn_from_latest,
+        row_number() over (partition by args ->> 'assetIn', args ->> 'assetOut'
+            order by cast(args ->> 'amountIn' as numeric) / cast(args ->> 'amountOut' as numeric) desc) rn_high,
+        row_number() over (partition by args ->> 'assetIn', args ->> 'assetOut'
+            order by cast(args ->> 'amountIn' as numeric) / cast(args ->> 'amountOut' as numeric)) rn_low,
+        cast(args ->> 'amountIn' as numeric) as amount_in,
+        cast(args ->> 'amountOut' as numeric) as amount_out
+    from
+        event
+    join block on event.block_id = block.id
+    where
+        name = 'Router.RouteExecuted'
+        and timestamp > now() - interval '1d'
+
 ),
-combos AS (
-  SELECT
-    la.asset_id AS asset_1_id,
-    lb.asset_id AS asset_2_id,
-    tm.symbol AS asset_1_symbol,
-    tme.symbol AS asset_2_symbol
-  FROM
-    listed la CROSS
-    JOIN listed lb
-    JOIN token_metadata tm ON la.asset_id = tm.id
-    JOIN token_metadata tme ON lb.asset_id = tme.id
+real_pairs as (
+    select
+        tm_in.symbol as base_currency,
+        tm_out.symbol as target_currency,
+        r.asset_in,
+        r.asset_out
+    from router_24h r
+    join token_metadata tm_in on r.asset_in = tm_in.id
+    join token_metadata tm_out on r.asset_out = tm_out.id
+    group by r.asset_in, r.asset_out, tm_in.symbol, tm_out.symbol
+),
+hide_stablepools as (
+    select
+        CASE WHEN asset_in = 100 THEN REPLACE(base_currency, '4-Pool', CASE WHEN asset_out = 10 THEN 'USDC' ELSE 'USDT' END)
+             WHEN asset_in = 101 THEN REPLACE(base_currency, '2-Pool', CASE WHEN asset_out = 11 THEN 'WBTC' ELSE 'iBTC' END)
+             WHEN asset_in = 102 THEN REPLACE(base_currency, '2-Pool-Stbl', CASE WHEN asset_out = 22 THEN 'USDT' ELSE 'USDC' END)
+             WHEN asset_out = 100 THEN REPLACE(base_currency, '4-Pool', CASE WHEN asset_in = 10 THEN 'USDC' ELSE 'USDT' END)
+             WHEN asset_out = 101 THEN REPLACE(base_currency, '2-Pool', CASE WHEN asset_in = 11 THEN 'WBTC' ELSE 'iBTC' END)
+             WHEN asset_out = 102 THEN REPLACE(base_currency, '2-Pool-Stbl', CASE WHEN asset_in = 22 THEN 'USDT' ELSE 'USDC' END)
+             ELSE base_currency
+        END as base_currency,
+        CASE WHEN asset_in = 100 THEN REPLACE(target_currency, '4-Pool', CASE WHEN asset_out = 10 THEN 'USDC' ELSE 'USDT' END)
+             WHEN asset_in = 101 THEN REPLACE(target_currency, '2-Pool', CASE WHEN asset_out = 11 THEN 'WBTC' ELSE 'iBTC' END)
+             WHEN asset_in = 102 THEN REPLACE(target_currency, '2-Pool-Stbl', CASE WHEN asset_out = 22 THEN 'USDT' ELSE 'USDC' END)
+             WHEN asset_out = 100 THEN REPLACE(target_currency, '4-Pool', CASE WHEN asset_in = 10 THEN 'USDC' ELSE 'USDT' END)
+             WHEN asset_out = 101 THEN REPLACE(target_currency, '2-Pool', CASE WHEN asset_in = 11 THEN 'WBTC' ELSE 'iBTC' END)
+             WHEN asset_out = 102 THEN REPLACE(target_currency, '2-Pool-Stbl', CASE WHEN asset_in = 22 THEN 'USDT' ELSE 'USDC' END)
+             ELSE target_currency
+        END as target_currency
+    from real_pairs
+),
+dedup as (
+    select
+        case when base_currency > target_currency then base_currency else target_currency end as base_currency,
+        case when base_currency > target_currency then target_currency else base_currency end as target_currency
+    from hide_stablepools
 )
-SELECT
-DISTINCT
-CASE WHEN asset_1_id > asset_2_id THEN CONCAT(
-  asset_1_symbol, '_', asset_2_symbol
-) ELSE CONCAT(
-  asset_2_symbol, '_', asset_1_symbol
-) END AS ticker_id,
-CASE WHEN asset_1_id > asset_2_id THEN asset_1_symbol ELSE asset_2_symbol END AS base,
-CASE WHEN asset_1_id > asset_2_id THEN asset_2_symbol ELSE asset_1_symbol END AS target
-FROM
-    combos c
-WHERE
-    asset_1_symbol <> asset_2_symbol
-ORDER BY
-    ticker_id,
-    base
\ No newline at end of file
+select
+    CONCAT(base_currency, '_', target_currency) as ticker_id,
+    base_currency as base,
+    target_currency as target
+from
+    dedup
+group by
+    ticker_id, base_currency, target_currency
\ No newline at end of file
diff --git a/queries/coingecko/v1/tickers.sql b/queries/coingecko/v1/tickers.sql
index 2e3db16..58ee144 100644
--- a/queries/coingecko/v1/tickers.sql
+++ b/queries/coingecko/v1/tickers.sql
@@ -1,568 +1,126 @@
 -- getTickers
-WITH omnipool_trades_all AS(
-  SELECT
-    substring(block_id, 4, 7):: numeric AS block,
-    (args ->> 'assetIn'):: numeric AS asset_in,
-    (args ->> 'assetOut'):: numeric AS asset_out,
-    (args ->> 'amountIn'):: numeric AS amount_in,
-    (args ->> 'amountOut'):: numeric AS amount_out,
-    timestamp
-  FROM
-    event e
-    JOIN block b ON e.block_id = b.id
-  WHERE
-    name IN (
-      'Omnipool.SellExecuted', 'Omnipool.BuyExecuted'
-    )
-),
-omnipool_trades_24 AS (
-  SELECT
-    *
-  from
-    omnipool_trades_all
-  where
-    timestamp > now() - interval '1 day'
-),
-hdx_changes AS (
-  SELECT
-    DISTINCT block_id,
-    '0' AS asset_id,
-    (args ->> 'amount'):: numeric AS amount
-  FROM
-    event
-  WHERE
-    name LIKE 'Balances.Transfer'
-    AND args ->> 'to' = '0x6d6f646c6f6d6e69706f6f6c0000000000000000000000000000000000000000'
-  UNION ALL
-  SELECT
-    DISTINCT block_id,
-    '0' AS asset_id,
-    -(args ->> 'amount'):: numeric AS amount
-  FROM
-    event
-  WHERE
-    name LIKE 'Balances.Transfer'
-    AND args ->> 'from' = '0x6d6f646c6f6d6e69706f6f6c0000000000000000000000000000000000000000'
-),
-tokens_changes AS (
-  SELECT
-    block_id,
-    args ->> 'currencyId' AS asset_id,
-    (args ->> 'amount'):: numeric AS amount
-  FROM
-    event
-  WHERE
-    name = 'Tokens.Transfer'
-    AND args ->> 'to' = '0x6d6f646c6f6d6e69706f6f6c0000000000000000000000000000000000000000'
-  UNION ALL
-  SELECT
-    block_id,
-    args ->> 'currencyId' AS asset_id,
-    -(args ->> 'amount'):: numeric AS amount
-  FROM
-    event
-  WHERE
-    name = 'Tokens.Transfer'
-    AND args ->> 'from' = '0x6d6f646c6f6d6e69706f6f6c0000000000000000000000000000000000000000'
-  UNION ALL
-  SELECT
-    block_id,
-    args ->> 'currencyId' AS asset_id,
-    (args ->> 'amount'):: numeric AS amount
-  FROM
-    event
-  WHERE
-    name = 'Tokens.Deposited'
-    AND args ->> 'who' = '0x6d6f646c6f6d6e69706f6f6c0000000000000000000000000000000000000000'
-  UNION ALL
-  SELECT
-    block_id,
-    args ->> 'currencyId' AS asset_id,
-    -(args ->> 'amount'):: numeric AS amount
-  FROM
-    event
-  WHERE
-    name = 'Tokens.Withdrawn'
-    AND args ->> 'who' = '0x6d6f646c6f6d6e69706f6f6c0000000000000000000000000000000000000000'
-),
-balance_changes AS (
-  SELECT
-    *
-  FROM
-    hdx_changes
-  UNION ALL
-  SELECT
-    *
-  FROM
-    tokens_changes
-),
-oa_rank AS (
-  SELECT
-    block,
-    asset_id :: text AS asset_id,
-    hub_reserve / 10 ^ 12 AS hub_reserve,
-    RANK() OVER (
-      ORDER BY
-        block DESC
-    ) AS rank
-  FROM
-    omnipool_asset
-  WHERE
-    block > (SELECT MAX(block) - 14400 /*2days*/ FROM omnipool_asset)
-
-),
-hub_reserve AS (
-  SELECT
-    block,
-    asset_id,
-    hub_reserve
-  FROM
-    oa_rank oa
-  WHERE
-    oa.rank = 1
-),
-token_data AS (
-  SELECT
-    height,
-    timestamp,
-    block_id,
-    asset_id,
-    symbol,
-    decimals,
-    amount,
-    SUM(amount) OVER (
-      PARTITION BY asset_id
-      ORDER BY
-        block_id
-    ) / 10 ^ decimals AS balance
-  FROM
-    balance_changes
-    JOIN block ON block_id = block.id
-    JOIN token_metadata ON asset_id = token_metadata.id :: text
-),
-alltime_bal AS (
-  SELECT
-    asset_id,
-    decimals,
-    symbol,
-    sum(amount) AS balance
-  FROM
-    token_data
-  GROUP BY
-    1,
-    2,
-    3
-),
-vol24 AS (
-  SELECT
-    asset_id,
-    decimals,
-    symbol,
-    sum(
-      abs(amount)
-    ) AS volume
-  FROM
-    token_data
-  WHERE
-    timestamp > now() - interval '1 day'
-  GROUP BY
-    1,
-    2,
-    3
-),
-lrna_in_usdt AS (
-  SELECT
-    block,
-    balance / 10 ^ decimals / hub_reserve AS lrna_price
-  FROM
-    alltime_bal a
-    JOIN hub_reserve hr ON a.asset_id = hr.asset_id
-  WHERE
-    hr.asset_id = '102'
-),
-spot AS (
-  SELECT
-    hub_reserve /(ab.balance / 10 ^ ab.decimals) * lrna_price AS price,
-    hub_reserve * lrna_price as liquidity,
-    a.asset_id :: numeric,
-    a.decimals,
-    a.symbol
-  FROM
-    vol24 a
-    JOIN hub_reserve hr ON a.asset_id = hr.asset_id
-    JOIN lrna_in_usdt liu ON hr.block = liu.block
-    JOIN alltime_bal ab ON a.asset_id = ab.asset_id
-),
-listed AS (
-  SELECT
-    DISTINCT asset_id
-  FROM
-    omnipool_asset
-  WHERE
-    asset_id NOT BETWEEN 100 AND 199
-  UNION SELECT 10
-  UNION SELECT 22
-),
-combos AS (
-  SELECT
-    la.asset_id AS asset_1_id,
-    lb.asset_id AS asset_2_id,
-    tm.symbol AS asset_1_symbol,
-    tme.symbol AS asset_2_symbol
-  FROM
-    listed la CROSS
-    JOIN listed lb
-    JOIN token_metadata tm ON la.asset_id = tm.id
-    JOIN token_metadata tme ON lb.asset_id = tme.id
-),
-pairs AS (
-  SELECT
-    DISTINCT
-    CASE WHEN asset_1_id > asset_2_id THEN CONCAT(
-      asset_1_symbol, '_', asset_2_symbol
-    ) ELSE CONCAT(
-      asset_2_symbol, '_', asset_1_symbol
-    ) END AS ticker_id,
-    CASE WHEN asset_1_id > asset_2_id THEN CONCAT(
-      asset_1_id, '_', asset_2_id
-    ) ELSE CONCAT(
-      asset_2_id, '_', asset_1_id
-    ) END AS asset_ids_concat,
-    CASE WHEN asset_1_id > asset_2_id THEN asset_1_symbol ELSE asset_2_symbol END AS base_currency,
-    CASE WHEN asset_1_id > asset_2_id THEN asset_2_symbol ELSE asset_1_symbol END AS target_currency
-  FROM
-    combos c
-  WHERE
-    asset_1_symbol <> asset_2_symbol
-  ORDER BY
-    ticker_id,
-    base_currency
-),
-omnipool_totals AS (
-  SELECT
-    asset_in,
-    asset_out,
-    sum(amount_in) AS amount_in,
-    sum(amount_out) AS amount_out
-  FROM
-    omnipool_trades_24
-  GROUP BY
-    1,
-    2
-),
-pair_volumes AS (
-  SELECT
-    CAST(
-        CASE
-            WHEN asset_in = 100 THEN REPLACE(asset_in::text, '100', CASE WHEN asset_out = '10' THEN '21' ELSE '10' END)
-            WHEN asset_in = 101 THEN REPLACE(asset_in::text, '101', CASE WHEN asset_out = '11' THEN '19' ELSE '11' END)
-            WHEN asset_in = 102 THEN REPLACE(asset_in::text, '102', CASE WHEN asset_out = '22' THEN '10' ELSE '22' END)
-            ELSE asset_in::text
-        END
-    AS INTEGER) as asset_1,
-    CAST(
-        CASE
-             WHEN asset_out = 100 THEN REPLACE(asset_out::text, '100', CASE WHEN asset_in = '10' THEN '21' ELSE '10' END)
-             WHEN asset_out = 101 THEN REPLACE(asset_out::text, '101', CASE WHEN asset_in = '11' THEN '19' ELSE '11' END)
-             WHEN asset_out = 102 THEN REPLACE(asset_out::text, '102', CASE WHEN asset_in = '22' THEN '10' ELSE '22' END)
-             ELSE asset_out::text
-    END
-    AS INTEGER) as asset_2,
-    CASE WHEN asset_in = 100 THEN REPLACE(s.symbol, '4-Pool', CASE WHEN s2.symbol = 'USDT' THEN 'USDC' ELSE 'USDT' END)
-         WHEN asset_in = 101 THEN REPLACE(s.symbol, '2-Pool', CASE WHEN s2.symbol = 'iBTC' THEN 'WBTC' ELSE 'iBTC' END)
-         WHEN asset_in = 102 THEN REPLACE(s.symbol, '2-Pool-Stbl', CASE WHEN s2.symbol = 'USDC' THEN 'USDT' ELSE 'USDC' END)
-         ELSE s.symbol
-    END as asset_1_symbol,
-    CASE WHEN asset_out = 100 THEN REPLACE(s2.symbol, '4-Pool', CASE WHEN s.symbol = 'USDT' THEN 'USDC' ELSE 'USDT' END)
-         WHEN asset_out = 101 THEN REPLACE(s2.symbol, '2-Pool', CASE WHEN s.symbol = 'iBTC' THEN 'WBTC' ELSE 'iBTC' END)
-         WHEN asset_out = 102 THEN REPLACE(s2.symbol, '2-Pool-Stbl', CASE WHEN s.symbol = 'USDC' THEN 'USDT' ELSE 'USDC' END)
-    ELSE s2.symbol END as asset_2_symbol,
-    amount_in / (10 ^ s.decimals) AS base_volume,
-    amount_out / (10 ^ s2.decimals) AS target_volume,
-    s.liquidity as liq1,
-    s2.liquidity as liq2
-  FROM
-    omnipool_totals ot
-    JOIN spot s ON ot.asset_in = s.asset_id
-    JOIN spot s2 ON ot.asset_out = s2.asset_id
-),
-commanding_asset AS (
-  select
-    CASE WHEN asset_1 > asset_2 THEN CONCAT(
-      asset_1_symbol, '_', asset_2_symbol
-    ) ELSE CONCAT(
-      asset_2_symbol, '_', asset_1_symbol
-    ) END AS ticker_id,
-    CASE WHEN asset_1 > asset_2 THEN CONCAT(
-      asset_1, '_', asset_2
-    ) ELSE CONCAT(
-      asset_2, '_', asset_1
-    ) END AS asset_ids_concat,
-    CASE WHEN asset_1 > asset_2 THEN base_volume ELSE target_volume END AS base_volume,
-    CASE WHEN asset_1 > asset_2 THEN target_volume ELSE base_volume END AS target_volume,
-    CASE WHEN asset_1 > asset_2 THEN liq1 ELSE liq2 END AS liquidity
-  FROM
-    pair_volumes
-),
-dedup_pair_vol AS (
-  select
-    ticker_id,
-    asset_ids_concat,
-    liquidity,
-    SUM(base_volume) AS base_volume,
-    SUM(target_volume) AS target_volume
-  from
-    commanding_asset
-  group by
-    1,
-    2,
-    3
-  order by
-    1
-),
-adjusted_pools AS (
-SELECT
-    amount_in, amount_out, timestamp, block,
-    CAST(
-        CASE WHEN asset_in = 100 THEN REPLACE(asset_in::text, '100', CASE WHEN asset_out = '10' THEN '21' ELSE '10' END)
-             WHEN asset_in = 101 THEN REPLACE(asset_in::text, '101', CASE WHEN asset_out = '11' THEN '19' ELSE '11' END)
-             WHEN asset_in = 102 THEN REPLACE(asset_in::text, '102', CASE WHEN asset_out = '22' THEN '10' ELSE '22' END)
-             ELSE asset_in::text
-        END
-    AS INTEGER ) as asset_in,
-    CAST(
-        CASE WHEN asset_out = 100 THEN REPLACE(asset_out::text, '100', CASE WHEN asset_in = '10' THEN '21' ELSE '10' END)
-             WHEN asset_out = 101 THEN REPLACE(asset_out::text, '101', CASE WHEN asset_in = '11' THEN '19' ELSE '11' END)
-             WHEN asset_out = 102 THEN REPLACE(asset_out::text, '102', CASE WHEN asset_in = '22' THEN '10' ELSE '22' END)
-             ELSE asset_out::text
-        END
-    AS INTEGER ) as asset_out,
-    CASE WHEN asset_in = 100 THEN REPLACE(s.symbol, '4-Pool', CASE WHEN s2.symbol = 'USDT' THEN 'USDC' ELSE 'USDT' END)
-         WHEN asset_in = 101 THEN REPLACE(s.symbol, '2-Pool', CASE WHEN s2.symbol = 'iBTC' THEN 'WBTC' ELSE 'iBTC' END)
-         WHEN asset_in = 102 THEN REPLACE(s.symbol, '2-Pool-Stbl', CASE WHEN s2.symbol = 'USDC' THEN 'USDT' ELSE 'USDC' END)
-         ELSE s.symbol
-    END as symbol_in,
-    CASE WHEN asset_out = 100 THEN REPLACE(s2.symbol, '4-Pool', CASE WHEN s.symbol = 'USDT' THEN 'USDC' ELSE 'USDT' END)
-         WHEN asset_out = 101 THEN REPLACE(s2.symbol, '2-Pool', CASE WHEN s.symbol = 'iBTC' THEN 'WBTC' ELSE 'iBTC' END)
-         WHEN asset_out = 102 THEN REPLACE(s2.symbol, '2-Pool-Stbl', CASE WHEN s.symbol = 'USDC' THEN 'USDT' ELSE 'USDC' END)
-    ELSE s2.symbol END as symbol_out,
-    CASE WHEN asset_in BETWEEN 100 AND 199 THEN 18
-         ELSE s.decimals
-    END as decimals_in,
-    CASE WHEN asset_out BETWEEN 100 AND 199 THEN 18
-         ELSE s2.decimals
-    END as decimals_out
-FROM
-    omnipool_trades_all
-    JOIN token_metadata s ON asset_in::integer = s.id
-    JOIN token_metadata s2 ON asset_out::integer = s2.id
-),
-command_last_trade AS(
-  select
-    CASE WHEN asset_in > asset_out THEN asset_in ELSE asset_out END AS asset_in,
-    CASE WHEN asset_in > asset_out THEN asset_out ELSE asset_in END AS asset_out,
-    CASE WHEN asset_in > asset_out THEN amount_in ELSE amount_out END AS amount_in,
-    CASE WHEN asset_in > asset_out THEN amount_out ELSE amount_in END AS amount_out,
-    CASE WHEN asset_in > asset_out THEN decimals_in ELSE decimals_out END AS decimals_in,
-    CASE WHEN asset_in > asset_out THEN decimals_out ELSE decimals_in END AS decimals_out,
-    CASE WHEN asset_in > asset_out THEN symbol_in ELSE symbol_out END AS symbol_in,
-    CASE WHEN asset_in > asset_out THEN symbol_out ELSE symbol_in END AS symbol_out,
-    block,
-    timestamp
-  FROM
-    adjusted_pools
-),
-adjusted_concat AS (
-    SELECT
-        amount_in, amount_out, timestamp, block, asset_in, asset_out, decimals_in, decimals_out,
-        CONCAT(asset_in, '_', asset_out) as asset_ids_concat,
-        CONCAT(symbol_in, '_', symbol_out) as ticker_id
-    FROM command_last_trade
-),
-trade_rank AS (
-  select
-    RANK() OVER (
-      PARTITION BY asset_in,
-      asset_out
-      ORDER BY
-        block DESC
-    ) AS rank_latest,
-    amount_in,
-    amount_out,
-    ticker_id,
-    decimals_in,
-    decimals_out,
-    asset_ids_concat
-  from
-    adjusted_concat
-),
-highs_lows AS (
-  select
-    RANK() OVER (
-      PARTITION BY asset_in,
-      asset_out
-      ORDER BY
-        (amount_in / amount_out) DESC
-    ) AS rank_high,
-    RANK() OVER (
-      PARTITION BY asset_in,
-      asset_out
-      ORDER BY
-        (amount_in / amount_out)
-    ) AS rank_low,
-    amount_in,
-    amount_out,
-    ticker_id,
-    decimals_in,
-    decimals_out,
-    asset_ids_concat
-  from
-    adjusted_concat
-  where
-    timestamp > now() - interval '1 day'
-),
-last_trades AS (
-  select
-    asset_ids_concat,
-    (
-      amount_in /(10 ^ decimals_in)
-    ) / (
-      amount_out /(10 ^ decimals_out)
-    ) as last_price
-  from
-    trade_rank
-  where
-    rank_latest = 1
-),
-lows AS (
-  select
-    ticker_id,
-    asset_ids_concat,
-    (
-      amount_in /(10 ^ decimals_in)
-    ) / (
-      amount_out /(10 ^ decimals_out)
-    ) as low
-  from
-    highs_lows
-  where
-    rank_low = 1
-),
-highs AS (
-  select
-    ticker_id,
-    asset_ids_concat,
-    (
-      amount_in /(10 ^ decimals_in)
-    ) / (
-      amount_out /(10 ^ decimals_out)
-    ) as high
-  from
-    highs_lows
-  where
-    rank_high = 1
-),
-xyk AS (
-    SELECT DISTINCT
-        block_id,
-        extrinsic_id,
-        phase,
-        args ->> 'assetIn' AS asset_in,
-        args ->> 'assetOut' AS asset_out,
-        CAST(args ->> 'buyPrice' AS numeric) AS amount_in,
-        CAST(args ->> 'amount' AS numeric) AS amount_out
-    FROM event e
-    WHERE name = 'XYK.BuyExecuted'
+with router_24h as (
+    select
+        cast(args ->> 'assetIn' as integer) as asset_in,
+        cast(args ->> 'assetOut' as integer) as asset_out,
+        row_number() over (partition by args ->> 'assetIn', args ->> 'assetOut' order by timestamp desc) rn_from_latest,
+        row_number() over (partition by args ->> 'assetIn', args ->> 'assetOut'
+            order by cast(args ->> 'amountIn' as numeric) / cast(args ->> 'amountOut' as numeric) desc) rn_high,
+        row_number() over (partition by args ->> 'assetIn', args ->> 'assetOut'
+            order by cast(args ->> 'amountIn' as numeric) / cast(args ->> 'amountOut' as numeric)) rn_low,
+        cast(args ->> 'amountIn' as numeric) as amount_in,
+        cast(args ->> 'amountOut' as numeric) as amount_out
+    from
+        event
+    join block on event.block_id = block.id
+    where
+        name = 'Router.RouteExecuted'
+        and timestamp > now() - interval '1d'
 
-    UNION ALL
-
-    SELECT DISTINCT
-        block_id,
-        extrinsic_id,
-        phase,
-        args ->> 'assetOut' AS asset_in,
-        args ->> 'assetIn' AS asset_out,
-        CAST(args ->> 'salePrice' AS numeric) AS amount_in,
-        CAST(args ->> 'amount' AS numeric) AS amount_out
-    FROM event e
-    WHERE name = 'XYK.SellExecuted'
-),
-xyk_ranking AS (
-    SELECT
-        block_id,
-        extrinsic_id,
-        phase,
-        timestamp,
-        CASE
-            WHEN asset_in > asset_out THEN asset_in
-            ELSE asset_out
-        END as asset_in,
-        CASE
-            WHEN asset_in > asset_out THEN asset_out
-            ELSE asset_in
-        END as asset_out,
-        CASE
-            WHEN asset_in > asset_out THEN amount_in
-            ELSE amount_out
-        END as amount_in,
-        CASE
-            WHEN asset_in > asset_out THEN amount_out
-            ELSE amount_in
-        END as amount_out
-    FROM xyk
-    JOIN block ON xyk.block_id = block.id
-    WHERE timestamp > now() - interval '1 day'
 ),
-xyk_pools AS (
-  SELECT
-      CONCAT(tm.symbol, '_', tme.symbol) as ticker_id,
-      tm.symbol as base_currency,
-      tme.symbol as target_currency,
-      amount_in / amount_out as last_price,
-      SUM(amount_in / 10^tm.decimals) OVER (PARTITION BY asset_in) as base_volume,
-      SUM(amount_out / 10^tme.decimals) OVER (PARTITION BY asset_out) as target_volume,
-      CONCAT(tm.symbol, '_', tme.symbol) as pool_id,
-      0 as liquidity_in_usd,
-      MAX(amount_in / amount_out) OVER (PARTITION BY asset_in) as high,
-      MIN(amount_in / amount_out) OVER (PARTITION BY asset_in) as low,
-      ROW_NUMBER() OVER (PARTITION BY tm.id, tme.id ORDER BY timestamp DESC) as rn
-  FROM xyk_ranking xr
-  JOIN token_metadata tm ON xr.asset_in = tm.id::text
-  JOIN token_metadata tme ON xr.asset_out = tme.id::text
-  WHERE tm.id NOT BETWEEN 100 AND 199 AND tme.id NOT BETWEEN 100 AND 199 -- filter out unreportable assets
-  ORDER BY timestamp DESC
+last_price as (
+    select
+        asset_in, asset_out,
+        (amount_in / 10^tm_in.decimals) / (amount_out / 10^tm_out.decimals) as price,
+        (amount_out / 10^tm_out.decimals) / (amount_in / 10^tm_in.decimals) as price_reversed
+    from router_24h r
+    join token_metadata tm_in on r.asset_in = tm_in.id
+    join token_metadata tm_out on r.asset_out = tm_out.id
+    where rn_from_latest = 1
+),
+high as (
+    select
+        asset_in, asset_out,
+        (amount_in / 10^tm_in.decimals) / (amount_out / 10^tm_out.decimals) as price,
+        (amount_out / 10^tm_out.decimals) / (amount_in / 10^tm_in.decimals) as price_reversed
+    from router_24h r
+    join token_metadata tm_in on r.asset_in = tm_in.id
+    join token_metadata tm_out on r.asset_out = tm_out.id
+    where rn_high = 1
+),
+low as (
+    select
+        asset_in, asset_out,
+        (amount_in / 10^tm_in.decimals) / (amount_out / 10^tm_out.decimals) as price,
+        (amount_out / 10^tm_out.decimals) / (amount_in / 10^tm_in.decimals) as price_reversed
+    from router_24h r
+    join token_metadata tm_in on r.asset_in = tm_in.id
+    join token_metadata tm_out on r.asset_out = tm_out.id
+    where rn_low = 1
+),
+real_pairs as (
+    select
+        tm_in.symbol as base_currency,
+        tm_out.symbol as target_currency,
+        max(lp.price) as last_price,
+        max(lp.price_reversed) as last_price_reversed,
+        max(h.price) as high,
+        max(l.price_reversed) as high_reversed,
+        min(l.price) as low,
+        min(h.price_reversed) as low_reversed,
+        sum(amount_in / 10^tm_in.decimals) as base_volume,
+        sum(amount_out / 10^tm_out.decimals) as target_volume,
+        r.asset_in,
+        r.asset_out
+    from router_24h r
+    join token_metadata tm_in on r.asset_in = tm_in.id
+    join token_metadata tm_out on r.asset_out = tm_out.id
+    join last_price lp on lp.asset_in = tm_in.id and lp.asset_out = tm_out.id
+    join high h on h.asset_in = tm_in.id and h.asset_out = tm_out.id
+    join low l on l.asset_in = tm_in.id and l.asset_out = tm_out.id
+    group by r.asset_in, r.asset_out, tm_in.symbol, tm_out.symbol
+),
+hide_stablepools as (
+    select
+        CASE WHEN asset_in = 100 THEN REPLACE(base_currency, '4-Pool', CASE WHEN asset_out = 10 THEN 'USDC' ELSE 'USDT' END)
+             WHEN asset_in = 101 THEN REPLACE(base_currency, '2-Pool', CASE WHEN asset_out = 11 THEN 'WBTC' ELSE 'iBTC' END)
+             WHEN asset_in = 102 THEN REPLACE(base_currency, '2-Pool-Stbl', CASE WHEN asset_out = 22 THEN 'USDT' ELSE 'USDC' END)
+             WHEN asset_out = 100 THEN REPLACE(base_currency, '4-Pool', CASE WHEN asset_in = 10 THEN 'USDC' ELSE 'USDT' END)
+             WHEN asset_out = 101 THEN REPLACE(base_currency, '2-Pool', CASE WHEN asset_in = 11 THEN 'WBTC' ELSE 'iBTC' END)
+             WHEN asset_out = 102 THEN REPLACE(base_currency, '2-Pool-Stbl', CASE WHEN asset_in = 22 THEN 'USDT' ELSE 'USDC' END)
+             ELSE base_currency
+        END as base_currency,
+        CASE WHEN asset_in = 100 THEN REPLACE(target_currency, '4-Pool', CASE WHEN asset_out = 10 THEN 'USDC' ELSE 'USDT' END)
+             WHEN asset_in = 101 THEN REPLACE(target_currency, '2-Pool', CASE WHEN asset_out = 11 THEN 'WBTC' ELSE 'iBTC' END)
+             WHEN asset_in = 102 THEN REPLACE(target_currency, '2-Pool-Stbl', CASE WHEN asset_out = 22 THEN 'USDT' ELSE 'USDC' END)
+             WHEN asset_out = 100 THEN REPLACE(target_currency, '4-Pool', CASE WHEN asset_in = 10 THEN 'USDC' ELSE 'USDT' END)
+             WHEN asset_out = 101 THEN REPLACE(target_currency, '2-Pool', CASE WHEN asset_in = 11 THEN 'WBTC' ELSE 'iBTC' END)
+             WHEN asset_out = 102 THEN REPLACE(target_currency, '2-Pool-Stbl', CASE WHEN asset_in = 22 THEN 'USDT' ELSE 'USDC' END)
+             ELSE target_currency
+        END as target_currency,
+        last_price,
+        last_price_reversed,
+        high,
+        high_reversed,
+        low,
+        low_reversed,
+        base_volume,
+        target_volume
+    from real_pairs
+),
+dedup as (
+    select
+        case when base_currency > target_currency then base_currency else target_currency end as base_currency,
+        case when base_currency > target_currency then target_currency else base_currency end as target_currency,
+        case when base_currency > target_currency then last_price else last_price_reversed end as last_price,
+        case when base_currency > target_currency then base_volume else target_volume end as base_volume,
+        case when base_currency > target_currency then target_volume else base_volume end as target_volume,
+        case when base_currency > target_currency then high else high_reversed end as high,
+        case when base_currency > target_currency then low else low_reversed end as low
+    from hide_stablepools
 )
-SELECT
-  p.ticker_id,
-  base_currency,
-  target_currency,
-  COALESCE(avg(last_price), 0) as last_price,
-  sum(COALESCE(base_volume, 0)) as base_volume,
-  sum(COALESCE(target_volume, 0)) as target_volume,
-  p.ticker_id as pool_id,
-  sum(COALESCE(liquidity, 0)) as liquidity_in_usd,
-  COALESCE(avg(high), 0) as high,
-  COALESCE(avg(low), 0) as low
-FROM
-  pairs p
-  left join last_trades lt on p.asset_ids_concat = lt.asset_ids_concat
-  left join highs h on h.asset_ids_concat = lt.asset_ids_concat
-  left join lows l on l.asset_ids_concat = lt.asset_ids_concat
-  left join dedup_pair_vol pv on pv.asset_ids_concat = p.asset_ids_concat
-GROUP BY 1,2,3,7
-
-UNION ALL
-
-SELECT
-  ticker_id,
-  base_currency,
-  target_currency,
-  last_price,
-  base_volume,
-  target_volume,
-  pool_id,
-  liquidity_in_usd,
-  high,
-  low
-FROM xyk_pools
-WHERE rn = 1
\ No newline at end of file
+select
+    CONCAT(base_currency, '_', target_currency) as ticker_id,
+    base_currency,
+    target_currency,
+    max(last_price) as last_price,
+    sum(base_volume) as base_volume,
+    sum(target_volume) as target_volume,
+    CONCAT(base_currency, '_', target_currency) as pool_id,
+    avg(0) as liquidity_in_usd,
+    max(high) as high,
+    min(low)as low
+from
+    dedup
+group by
+    ticker_id, base_currency, target_currency, pool_id
\ No newline at end of file
diff --git a/variables.mjs b/variables.mjs
index 1268490..511e21c 100644
--- a/variables.mjs
+++ b/variables.mjs
@@ -40,11 +40,11 @@ export const JOBS = {
 export const CACHE_SETTINGS = {
   coingeckoV1Pairs: {
     key: "coingecko_v1_pairs",
-    expire_after: 60 * 60,
+    expire_after: 10,
   },
   coingeckoV1Tickers: {
     key: "coingecko_v1_tickers",
-    expire_after: 12 * 60,
+    expire_after: 10,
   },
   hydradxUiV1StatsTvl: {
     key: "hydradx-ui_v1_stats_tvl",