diff --git a/projects/subgraph-bean/src/BeanstalkHandler.ts b/projects/subgraph-bean/src/BeanstalkHandler.ts
index 91e1948f78..b01e3ece45 100644
--- a/projects/subgraph-bean/src/BeanstalkHandler.ts
+++ b/projects/subgraph-bean/src/BeanstalkHandler.ts
@@ -1,7 +1,7 @@
 import { BigInt } from "@graphprotocol/graph-ts";
 import { Sunrise } from "../generated/Beanstalk/Beanstalk";
 import { getBeanTokenAddress, loadBean, updateBeanSeason, updateBeanValues } from "./utils/Bean";
-import { updatePoolPrice, updatePoolSeason } from "./utils/Pool";
+import { loadOrCreatePool, updatePoolPrice, updatePoolSeason, updatePoolValues } from "./utils/Pool";
 import { BeanstalkPrice } from "../generated/Beanstalk/BeanstalkPrice";
 import { BEANSTALK_PRICE, BEAN_3CRV, BEAN_ERC20, BEAN_WETH_CP2_WELL, CURVE_PRICE } from "../../subgraph-core/utils/Constants";
 import { ZERO_BD, ZERO_BI, toDecimal } from "../../subgraph-core/utils/Decimals";
@@ -17,6 +17,7 @@ export function handleSunrise(event: Sunrise): void {
 
   let bean = loadBean(beanToken);
   let oldBeanPrice = bean.price;
+  let oldBeanLiquidity = bean.liquidityUSD;
   for (let i = 0; i < bean.pools.length; i++) {
     updatePoolSeason(bean.pools[i], event.block.timestamp, event.block.number, event.params.season.toI32());
   }
@@ -26,30 +27,63 @@ export function handleSunrise(event: Sunrise): void {
     // Attempt to pull from Beanstalk Price contract first for the overall Bean price update
     let beanstalkPrice = BeanstalkPrice.bind(BEANSTALK_PRICE);
     let beanstalkQuery = beanstalkPrice.try_price();
+
     if (!beanstalkQuery.reverted) {
       // We can use the Beanstalk Price contract to update overall price, and call the updates for Curve and Well price updates
       // We also know that the additional calls should not revert at this point
+      let beanCurve = loadOrCreatePool(BEAN_3CRV.toHexString(), event.block.number);
+      let beanWell = loadOrCreatePool(BEAN_WETH_CP2_WELL.toHexString(), event.block.number);
+
+      let deltaBeanLiquidity = toDecimal(beanstalkQuery.value.liquidity).minus(oldBeanLiquidity);
 
       let beanPrice = toDecimal(beanstalkQuery.value.price);
       // Overall Bean update
-      updateBeanValues(BEAN_ERC20.toHexString(), event.block.timestamp, beanPrice, ZERO_BI, ZERO_BI, ZERO_BD, ZERO_BD);
+      updateBeanValues(BEAN_ERC20.toHexString(), event.block.timestamp, beanPrice, ZERO_BI, ZERO_BI, ZERO_BD, deltaBeanLiquidity);
 
       // Curve pool update
-      let curvePrice = beanstalkPrice.getCurve().price;
-      updatePoolPrice(BEAN_3CRV.toHexString(), event.block.timestamp, event.block.number, toDecimal(curvePrice));
+      let curvePrice = beanstalkPrice.getCurve();
+      updatePoolValues(
+        BEAN_3CRV.toHexString(),
+        event.block.timestamp,
+        event.block.number,
+        ZERO_BI,
+        ZERO_BD,
+        toDecimal(curvePrice.liquidity).minus(beanCurve.liquidityUSD),
+        curvePrice.deltaB
+      );
+      updatePoolPrice(BEAN_3CRV.toHexString(), event.block.timestamp, event.block.number, toDecimal(curvePrice.price));
 
-      // Curve pool update
-      let wellPrice = beanstalkPrice.getConstantProductWell(BEAN_WETH_CP2_WELL).price;
-      updatePoolPrice(BEAN_WETH_CP2_WELL.toHexString(), event.block.timestamp, event.block.number, toDecimal(wellPrice));
+      // Well pool update
+      let wellPrice = beanstalkPrice.getConstantProductWell(BEAN_WETH_CP2_WELL);
+      updatePoolValues(
+        BEAN_WETH_CP2_WELL.toHexString(),
+        event.block.timestamp,
+        event.block.number,
+        ZERO_BI,
+        ZERO_BD,
+        toDecimal(wellPrice.liquidity).minus(beanWell.liquidityUSD),
+        wellPrice.deltaB
+      );
+      updatePoolPrice(BEAN_WETH_CP2_WELL.toHexString(), event.block.timestamp, event.block.number, toDecimal(wellPrice.price));
 
       checkBeanCross(BEAN_ERC20.toHexString(), event.block.timestamp, event.block.number, oldBeanPrice, beanPrice);
     } else {
       // Pre Basin deployment - Use original Curve price contract to update on each season.
       let curvePrice = CurvePrice.bind(CURVE_PRICE);
       let curve = curvePrice.try_getCurve();
+      let beanCurve = loadOrCreatePool(BEAN_3CRV.toHexString(), event.block.number);
 
       if (!curve.reverted) {
         updateBeanValues(BEAN_ERC20.toHexString(), event.block.timestamp, toDecimal(curve.value.price), ZERO_BI, ZERO_BI, ZERO_BD, ZERO_BD);
+        updatePoolValues(
+          BEAN_3CRV.toHexString(),
+          event.block.timestamp,
+          event.block.number,
+          ZERO_BI,
+          ZERO_BD,
+          toDecimal(curve.value.liquidity).minus(beanCurve.liquidityUSD),
+          curve.value.deltaB
+        );
         updatePoolPrice(BEAN_3CRV.toHexString(), event.block.timestamp, event.block.number, toDecimal(curve.value.price));
         checkBeanCross(BEAN_ERC20.toHexString(), event.block.timestamp, event.block.number, oldBeanPrice, toDecimal(curve.value.price));
       }