diff --git a/.gas-snapshot b/.gas-snapshot
index f0c1835..a016f7c 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,12 +1,12 @@
-LibConformStringTest:testConformStringFuzz(string,uint256) (runs: 255, μ: 157458, ~: 39347)
-LibParseCharIsMaskTest:testIsMaskPastEnd(uint256,uint256,uint256) (runs: 256, μ: 14404, ~: 16067)
-LibParseCharIsMaskTest:testIsMaskReference(string,uint256,uint256) (runs: 248, μ: 8002, ~: 8047)
-LibParseCharSkipMaskTest:testSkipMaskPastEnd(uint256,uint256,uint256) (runs: 256, μ: 14151, ~: 15971)
-LibParseCharSkipMaskTest:testSkipMaskReference(string,uint256,uint256) (runs: 248, μ: 8192, ~: 8112)
-TestLibParseDecimalUnsafeDecimalStringToInt:testUnsafeDecimalStrToIntEmpty(uint256,uint256) (runs: 256, μ: 4284, ~: 4096)
-TestLibParseDecimalUnsafeDecimalStringToInt:testUnsafeDecimalStrToIntOverflowVeryLarge(uint256,uint256,uint8) (runs: 253, μ: 41972, ~: 35920)
-TestLibParseDecimalUnsafeDecimalStringToInt:testUnsafeDecimalStrToIntRoundTrip(uint256,uint8) (runs: 256, μ: 29196, ~: 22423)
-TestLibParseDecimalUnsafeDecimalStringToSignedInt:testUnsafeStrToSignedIntExamples() (gas: 49608)
-TestLibParseDecimalUnsafeDecimalStringToSignedInt:testUnsafeStrToSignedIntOverflowNegative(uint256,uint8) (runs: 256, μ: 42659, ~: 33072)
-TestLibParseDecimalUnsafeDecimalStringToSignedInt:testUnsafeStrToSignedIntOverflowPositive(uint256,uint8) (runs: 256, μ: 42661, ~: 33074)
-TestLibParseDecimalUnsafeDecimalStringToSignedInt:testUnsafeStrToSignedIntRoundTrip(uint256,uint8,bool) (runs: 256, μ: 31559, ~: 25797)
\ No newline at end of file
+LibConformStringTest:testConformStringFuzz(string,uint256) (runs: 255, μ: 151751, ~: 38658)
+LibParseCharIsMaskTest:testIsMaskPastEnd(uint256,uint256,uint256) (runs: 256, μ: 13989, ~: 15797)
+LibParseCharIsMaskTest:testIsMaskReference(string,uint256,uint256) (runs: 248, μ: 7891, ~: 7941)
+LibParseCharSkipMaskTest:testSkipMaskPastEnd(uint256,uint256,uint256) (runs: 256, μ: 13990, ~: 15774)
+LibParseCharSkipMaskTest:testSkipMaskReference(string,uint256,uint256) (runs: 248, μ: 8076, ~: 8004)
+TestLibParseDecimalUnsafeDecimalStringToInt:testUnsafeDecimalStrToIntEmpty(uint256,uint256) (runs: 256, μ: 4162, ~: 3838)
+TestLibParseDecimalUnsafeDecimalStringToInt:testUnsafeDecimalStrToIntOverflowVeryLarge(uint256,uint256,uint8) (runs: 253, μ: 40818, ~: 34560)
+TestLibParseDecimalUnsafeDecimalStringToInt:testUnsafeDecimalStrToIntRoundTrip(uint256,uint8) (runs: 256, μ: 28814, ~: 22318)
+TestLibParseDecimalUnsafeDecimalStringToSignedInt:testUnsafeStrToSignedIntExamples() (gas: 49315)
+TestLibParseDecimalUnsafeDecimalStringToSignedInt:testUnsafeStrToSignedIntOverflowNegative(uint256,uint8) (runs: 256, μ: 40273, ~: 31512)
+TestLibParseDecimalUnsafeDecimalStringToSignedInt:testUnsafeStrToSignedIntOverflowPositive(uint256,uint8) (runs: 256, μ: 40288, ~: 31527)
+TestLibParseDecimalUnsafeDecimalStringToSignedInt:testUnsafeStrToSignedIntRoundTrip(uint256,uint8,bool) (runs: 256, μ: 30365, ~: 25176)
\ No newline at end of file
diff --git a/foundry.lock b/foundry.lock
index b413188..716e911 100644
--- a/foundry.lock
+++ b/foundry.lock
@@ -1,8 +1,8 @@
 {
   "lib/openzeppelin-contracts": {
-    "rev": "dc44c9f1a4c3b10af99492eed84f83ed244203f6"
+    "rev": "fcbae5394ae8ad52d8e580a3477db99814b9d565"
   },
   "lib/rain.solmem": {
-    "rev": "c1c22cf27963a9de0889ebf7f52869050f1fdfb9"
+    "rev": "f28da2f09d42d154783cb53c138a7ef2f3a9eb4a"
   }
 }
\ No newline at end of file
diff --git a/foundry.toml b/foundry.toml
index 39862ca..694fa30 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -4,4 +4,4 @@
 solc = "0.8.25"
 optimizer = true
 optimizer_runs = 100000
-evm_version = "paris"
\ No newline at end of file
+evm_version = "cancun"
\ No newline at end of file
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
index dc44c9f..fcbae53 160000
--- a/lib/openzeppelin-contracts
+++ b/lib/openzeppelin-contracts
@@ -1 +1 @@
-Subproject commit dc44c9f1a4c3b10af99492eed84f83ed244203f6
+Subproject commit fcbae5394ae8ad52d8e580a3477db99814b9d565
diff --git a/lib/rain.solmem b/lib/rain.solmem
index c1c22cf..f28da2f 160000
--- a/lib/rain.solmem
+++ b/lib/rain.solmem
@@ -1 +1 @@
-Subproject commit c1c22cf27963a9de0889ebf7f52869050f1fdfb9
+Subproject commit f28da2f09d42d154783cb53c138a7ef2f3a9eb4a