diff --git a/.env.example b/.env.example
index 8b735f91..2ddd319a 100644
--- a/.env.example
+++ b/.env.example
@@ -1,7 +1,6 @@
-ETH_RPC_URL=
+ETH_RPC_URL=https://rpc.ankr.com/eth
 FTM_RPC_URL=https://rpcapi.fantom.network
 ARBI_RPC_URL=https://arb1.arbitrum.io/rpc
 GC_RPC_URL=https://xdai.poanetwork.dev
 BSC_RPC_URL=https://bsc-dataseed.binance.org
-MATIC_RPC_URL=
-ETHERSCAN_API_KEY=
\ No newline at end of file
+MATIC_RPC_URL=https://rpc.ankr.com/polygon
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index cf82e815..dc57e40f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-	branch = v1.5.3
+	branch = master
 [submodule "lib/tokenized-strategy"]
 	path = lib/tokenized-strategy
 	url = https://github.com/yearn/tokenized-strategy
diff --git a/Makefile b/Makefile
index 3838face..9a7a7d10 100644
--- a/Makefile
+++ b/Makefile
@@ -11,16 +11,16 @@ inspect :; forge inspect ${contract} storage-layout --pretty
 FORK_URL := ${ETH_RPC_URL} 
 
 # local tests without fork
-test  :; forge test -vv --fork-url ${FORK_URL} --etherscan-api-key ${ETHERSCAN_API_KEY}
-trace  :; forge test -vvv --fork-url ${FORK_URL} --etherscan-api-key ${ETHERSCAN_API_KEY}
-gas  :; forge test --fork-url ${FORK_URL} --etherscan-api-key ${ETHERSCAN_API_KEY} --gas-report
-test-contract  :; forge test -vv --match-contract $(contract) --fork-url ${FORK_URL} --etherscan-api-key ${ETHERSCAN_API_KEY}
-test-contract-gas  :; forge test --gas-report --match-contract ${contract} --fork-url ${FORK_URL} --etherscan-api-key ${ETHERSCAN_API_KEY}
-trace-contract  :; forge test -vvv --match-contract $(contract) --fork-url ${FORK_URL} --etherscan-api-key ${ETHERSCAN_API_KEY}
-test-test  :; forge test -vv --match-test $(test) --fork-url ${FORK_URL} --etherscan-api-key ${ETHERSCAN_API_KEY}
-trace-test  :; forge test -vvv --match-test $(test) --fork-url ${FORK_URL} --etherscan-api-key ${ETHERSCAN_API_KEY}
-snapshot :; forge snapshot -vv --fork-url ${FORK_URL} --etherscan-api-key ${ETHERSCAN_API_KEY}
-snapshot-diff :; forge snapshot --diff -vv --fork-url ${FORK_URL} --etherscan-api-key ${ETHERSCAN_API_KEY}
+test  :; forge test -vv --fork-url ${FORK_URL}
+trace  :; forge test -vvv --fork-url ${FORK_URL}
+gas  :; forge test --fork-url ${FORK_URL} --gas-report
+test-contract  :; forge test -vv --match-contract $(contract) --fork-url ${FORK_URL}
+test-contract-gas  :; forge test --gas-report --match-contract ${contract} --fork-url ${FORK_URL}
+trace-contract  :; forge test -vvv --match-contract $(contract) --fork-url ${FORK_URL}
+test-test  :; forge test -vv --match-test $(test) --fork-url ${FORK_URL}
+trace-test  :; forge test -vvv --match-test $(test) --fork-url ${FORK_URL}
+snapshot :; forge snapshot -vv --fork-url ${FORK_URL}
+snapshot-diff :; forge snapshot --diff -vv --fork-url ${FORK_URL}
 
 
 clean  :; forge clean
diff --git a/README.md b/README.md
index 8253f92a..a793f001 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,9 @@ For a more complete overview of how the Tokenized Strategies work please visit t
 
 ### Requirements
 
-First you will need to install [Foundry](https://book.getfoundry.sh/getting-started/installation).
+- First you will need to install [Foundry](https://book.getfoundry.sh/getting-started/installation).
 NOTE: If you are on a windows machine it is recommended to use [WSL](https://learn.microsoft.com/en-us/windows/wsl/install)
+- Install [Node.js](https://nodejs.org/en/download/package-manager/)
 
 ### Clone this repository
 
@@ -25,8 +26,7 @@ yarn
 
 ### Set your environment Variables
 
-Sign up for [Infura](https://infura.io/) and generate an API key and copy your RPC url. Store it in the `ETH_RPC_URL` environment variable.
-NOTE: you can use other services.
+Use the `.env.example` template to create a `.env` file and store the environement variables. You will need to populate the `RPC_URL` for the desired network(s). RPC url can be obtained from various providers, including [Ankr](https://www.ankr.com/rpc/) (no sign-up required) and [Infura](https://infura.io/).
 
 Use .env file
 
diff --git a/lib/forge-std b/lib/forge-std
index fc560fa3..bb4ceea9 160000
--- a/lib/forge-std
+++ b/lib/forge-std
@@ -1 +1 @@
-Subproject commit fc560fa34fa12a335a50c35d92e55a6628ca467c
+Subproject commit bb4ceea94d6f10eeb5b41dc2391c6c8bf8e734ef
diff --git a/lib/tokenized-strategy-periphery b/lib/tokenized-strategy-periphery
index 3986b04b..bbc3a035 160000
--- a/lib/tokenized-strategy-periphery
+++ b/lib/tokenized-strategy-periphery
@@ -1 +1 @@
-Subproject commit 3986b04bc9f49af8d2615e198a531b16c1e0ccf2
+Subproject commit bbc3a0354f45dab087a4c82650e42225433c8fef