diff --git a/bun.lockb b/bun.lockb
index feda7fd..f75c518 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/package.json b/package.json
index 3350c1a..e56ca25 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "forge-std": "github:foundry-rs/forge-std#v1.7.5",
     "prettier": "^3.0.0",
     "solhint": "^3.6.2",
-    "@pendle/core-v2": "^4.7.0"
+    "@pendle/core-v2": "^5.2.0-beta-5"
   },
   "keywords": [
     "blockchain",
diff --git a/test/ChainlinkOracleSample.sol b/test/ChainlinkOracleSample.sol
new file mode 100644
index 0000000..f04d8bd
--- /dev/null
+++ b/test/ChainlinkOracleSample.sol
@@ -0,0 +1,94 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.23 <0.9.0;
+
+import { PRBTest } from "@prb/test/src/PRBTest.sol";
+import { console2 as console } from "forge-std/src/console2.sol";
+import { StdCheats } from "forge-std/src/StdCheats.sol";
+import "@pendle/core-v2/contracts/interfaces/IPAllActionV3.sol";
+import "@pendle/core-v2/contracts/interfaces/IPMarket.sol";
+import "@pendle/core-v2/contracts/oracles/PtYtLpOracle/PendlePYLpOracle.sol";
+import "../src/StructGen.sol";
+import { AggregatorV2V3Interface as IChainlinkAggregator } from "@chainlink/contracts/src/v0.8/interfaces/AggregatorV2V3Interface.sol";
+import "@pendle/core-v2/contracts/oracles/PtYtLpOracle/chainlink/PendleChainlinkOracleFactory.sol";
+import "@pendle/core-v2/contracts/oracles/PtYtLpOracle/chainlink/PendleChainlinkOracle.sol";
+
+contract ChainlinkOracleSample2 is PRBTest, StdCheats, StructGen {
+  using PendlePYOracleLib for IPMarket;
+  using PendleLpOracleLib for IPMarket;
+
+  IStandardizedYield public SY;
+  IPPrincipalToken public PT;
+  IPYieldToken public YT;
+
+  IPMarket public constant market = IPMarket(0xCaE62858DB831272A03768f5844cbe1B40bB381f);
+  PendleChainlinkOracleFactory public factory;
+  PendleChainlinkOracle public PT_LBTC_oracle;
+  PendleChainlinkOracle public YT_LBTC_oracle;
+  PendleChainlinkOracle public LP_LBTC_oracle;
+  PendleChainlinkOracleWithQuote public PT_USD_oracle;
+  PendleChainlinkOracleWithQuote public YT_USD_oracle;
+  PendleChainlinkOracleWithQuote public LP_USD_oracle;
+
+  IChainlinkAggregator public constant LBTC_USD_feed = IChainlinkAggregator(0x5c29868C58b6e15e2b962943278969Ab6a7D3212);
+
+  uint16 public constant twapDuration = 900;
+
+  function setUp() public virtual {
+    vm.createSelectFork({ urlOrAlias: "mainnet", blockNumber: 21193294 });
+    (SY, PT, YT) = IPMarket(market).readTokens();
+    factory = new PendleChainlinkOracleFactory(0x9a9Fa8338dd5E5B2188006f1Cd2Ef26d921650C2);
+    PT_LBTC_oracle = PendleChainlinkOracle(
+      factory.createOracle(address(market), twapDuration, PendleOracleType.PT_TO_SY)
+    );
+    YT_LBTC_oracle = PendleChainlinkOracle(
+      factory.createOracle(address(market), twapDuration, PendleOracleType.YT_TO_SY)
+    );
+    LP_LBTC_oracle = PendleChainlinkOracle(
+      factory.createOracle(address(market), twapDuration, PendleOracleType.LP_TO_SY)
+    );
+
+    PT_USD_oracle = PendleChainlinkOracleWithQuote(
+      factory.createOracleWithQuote(address(market), twapDuration, PendleOracleType.PT_TO_SY, address(LBTC_USD_feed))
+    );
+    YT_USD_oracle = PendleChainlinkOracleWithQuote(
+      factory.createOracleWithQuote(address(market), twapDuration, PendleOracleType.YT_TO_SY, address(LBTC_USD_feed))
+    );
+    LP_USD_oracle = PendleChainlinkOracleWithQuote(
+      factory.createOracleWithQuote(address(market), twapDuration, PendleOracleType.LP_TO_SY, address(LBTC_USD_feed))
+    );
+  }
+
+  function test_get_prices_in_SY() external view {
+    (uint80 roundId, int256 answer, , uint256 updatedAt, uint80 answeredInRound) = PT_LBTC_oracle.latestRoundData();
+    console.log("PT LBTC to SY-LBTC");
+    console.log(uint256(roundId), uint256(answer), updatedAt, uint256(answeredInRound));
+    // answer = 992893819205953801, meaning 1 PT = 0.992893819205953801 SY-LBTC
+
+    (roundId, answer, , updatedAt, answeredInRound) = YT_LBTC_oracle.latestRoundData();
+    console.log("YT LBTC to SY-LBTC");
+    console.log(uint256(roundId), uint256(answer), updatedAt, uint256(answeredInRound));
+    // answer = 7106180794046199, meaning 1 YT = 0.007106180794046199 SY-LBTC
+
+    (roundId, answer, , updatedAt, answeredInRound) = LP_LBTC_oracle.latestRoundData();
+    console.log("LP LBTC to SY-LBTC");
+    console.log(uint256(roundId), uint256(answer), updatedAt, uint256(answeredInRound));
+    // answer = 20865967605624365040000000000, meaning 1 LP = 20865967605.624363 SY-LBTC (note that 1 LP = 10^18 unit of LP, actual LP qty is much smaller)
+  }
+
+  function test_get_prices_in_quote() external view {
+    (uint80 roundId, int256 answer, , uint256 updatedAt, uint80 answeredInRound) = PT_USD_oracle.latestRoundData();
+    console.log("PT LBTC to BTC");
+    console.log(uint256(roundId), uint256(answer), updatedAt, uint256(answeredInRound));
+    // answer = 990999427443599801, meaning 1 PT = 0.9909994274435997 BTC
+
+    (roundId, answer, , updatedAt, answeredInRound) = YT_USD_oracle.latestRoundData();
+    console.log("YT LBTC to BTC");
+    console.log(uint256(roundId), uint256(answer), updatedAt, uint256(answeredInRound));
+    // answer = 7092622556400198, meaning 1 YT = 0.007092622556400198 BTC
+
+    (roundId, answer, , updatedAt, answeredInRound) = LP_USD_oracle.latestRoundData();
+    console.log("LP LBTC to BTC");
+    console.log(uint256(roundId), uint256(answer), updatedAt, uint256(answeredInRound));
+    // answer = 20826156382731214032721932000, meaning 1 LP = 20826156382.731216 BTC (note that 1 LP = 10^18 unit of LP, actual LP qty is much smaller)
+  }
+}
diff --git a/test/OracleSample.sol b/test/OracleSample.sol
index 456a57d..e29d6f1 100644
--- a/test/OracleSample.sol
+++ b/test/OracleSample.sol
@@ -6,7 +6,7 @@ import { console2 as console } from "forge-std/src/console2.sol";
 import { StdCheats } from "forge-std/src/StdCheats.sol";
 import "@pendle/core-v2/contracts/interfaces/IPAllActionV3.sol";
 import "@pendle/core-v2/contracts/interfaces/IPMarket.sol";
-import "@pendle/core-v2/contracts/oracles/PendlePYLpOracle.sol";
+import "@pendle/core-v2/contracts/oracles/PtYtLpOracle/PendlePYLpOracle.sol";
 import "../src/StructGen.sol";
 import { AggregatorV2V3Interface as IChainlinkAggregator } from "@chainlink/contracts/src/v0.8/interfaces/AggregatorV2V3Interface.sol";