diff --git a/.gas-snapshot b/.gas-snapshot
index f0e7c3b..09a4da5 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,55 +1,55 @@
 AuthorshipTokenTest:test_curtaMint() (gas: 85648)
 AuthorshipTokenTest:test_curtaMint_SenderIsNotCurta_RevertsUnauthorized(address) (runs: 256, μ: 10204, ~: 10204)
-AuthorshipTokenTest:test_ownerMint_FuzzMintTimestamps_IssuesTokensCorrectly(uint256) (runs: 256, μ: 6505633, ~: 6043360)
+AuthorshipTokenTest:test_ownerMint_FuzzMintTimestamps_IssuesTokensCorrectly(uint256) (runs: 256, μ: 6429317, ~: 5952400)
 AuthorshipTokenTest:test_ownerMint_SenderIsNotOwner_RevertUnauthorized(address) (runs: 256, μ: 12935, ~: 12935)
 AuthorshipTokenTest:test_ownerMint_SenderIsOwner_AllowsMint() (gas: 108202)
 AuthorshipTokenTest:test_tokenURI_MintedToken_Succeeds() (gas: 232)
-AuthorshipTokenTest:test_tokenURI_UnmintedToken_Fails() (gas: 11055)
+AuthorshipTokenTest:test_tokenURI_UnmintedToken_Fails() (gas: 12629)
 CurtaTest:test_Initialization_DeployAddressesMatch() (gas: 11297)
-CurtaTest:test_addPuzzle() (gas: 303991)
-CurtaTest:test_addPuzzle_UseAuthorshipToken_UpdatesStorage() (gas: 297194)
-CurtaTest:test_addPuzzle_UseSameAuthorshipTokenTwice_Fails() (gas: 298014)
+CurtaTest:test_addPuzzle() (gas: 305332)
+CurtaTest:test_addPuzzle_UseAuthorshipToken_UpdatesStorage() (gas: 298535)
+CurtaTest:test_addPuzzle_UseSameAuthorshipTokenTwice_Fails() (gas: 299355)
 CurtaTest:test_addPuzzle_UseUnownedAuthorshipToken_RevertsUnauthorized() (gas: 199252)
-CurtaTest:test_approve() (gas: 433535)
-CurtaTest:test_approve_SenderIsNotOwner_RevertsUnauthorized() (gas: 409039)
-CurtaTest:test_approve_WithApprovalForAllTrue_AllowsTransfer() (gas: 455755)
+CurtaTest:test_approve() (gas: 434876)
+CurtaTest:test_approve_SenderIsNotOwner_RevertsUnauthorized() (gas: 410380)
+CurtaTest:test_approve_WithApprovalForAllTrue_AllowsTransfer() (gas: 457096)
 CurtaTest:test_balanceOf_ZeroAddress_Fails() (gas: 8674)
 CurtaTest:test_setApprovalForAll_False_UpdatesStorage() (gas: 15966)
 CurtaTest:test_setApprovalForAll_True_UpdatesStorage() (gas: 35841)
-CurtaTest:test_setFermat_AsRandomAccount_Succeeds(address) (runs: 256, μ: 453796, ~: 453796)
-CurtaTest:test_setFermat_InitialSet_UpdatesStorage() (gas: 509601)
-CurtaTest:test_setFermat_SetAfterTransfer_Succeeds(address) (runs: 256, μ: 873913, ~: 873913)
-CurtaTest:test_setFermat_SetDifferentPuzzlesTwiceInIncreasingOrder_Succeeds() (gas: 867472)
-CurtaTest:test_setFermat_SetNonFermatPuzzle_Fails() (gas: 777525)
-CurtaTest:test_setFermat_SetSamePuzzleTwice_Fails() (gas: 455572)
-CurtaTest:test_setFermat_SetUnsolvedPuzzle_Fails() (gas: 298803)
-CurtaTest:test_setPuzzleColors() (gas: 304888)
-CurtaTest:test_setPuzzleColors_SetUnauthoredPuzzle_RevertsUnauthorized() (gas: 298166)
-CurtaTest:test_solve() (gas: 656199)
-CurtaTest:test_solve_DuringAllPhases_FirstSolveTimestampOnlySetOnFirstBlood(uint40) (runs: 256, μ: 519608, ~: 518934)
-CurtaTest:test_solve_DuringPhase1WithPayment_PaysAuthor(uint256) (runs: 256, μ: 494376, ~: 495633)
-CurtaTest:test_solve_DuringPhase2WithPayment_PaysAuthor(uint256) (runs: 256, μ: 532556, ~: 532556)
-CurtaTest:test_solve_DuringPhase2_RequiresETH(uint256) (runs: 256, μ: 488065, ~: 486303)
-CurtaTest:test_solve_DuringPhase3_Fails(uint40) (runs: 256, μ: 432757, ~: 432757)
-CurtaTest:test_solve_FirstBlood_AuthorshipTokenMintPotentialRevertBranch() (gas: 309908)
-CurtaTest:test_solve_FirstBlood_MintsAuthorshipToken() (gas: 411160)
-CurtaTest:test_solve_FirstBlood_UpdatesFirstSolveTimestamp(uint40) (runs: 256, μ: 405999, ~: 405999)
-CurtaTest:test_solve_IncorrectSolution_Fails(uint256) (runs: 256, μ: 307909, ~: 307909)
+CurtaTest:test_setFermat_AsRandomAccount_Succeeds(address) (runs: 256, μ: 455137, ~: 455137)
+CurtaTest:test_setFermat_InitialSet_UpdatesStorage() (gas: 511807)
+CurtaTest:test_setFermat_SetAfterTransfer_Succeeds(address) (runs: 256, μ: 876595, ~: 876595)
+CurtaTest:test_setFermat_SetDifferentPuzzlesTwiceInIncreasingOrder_Succeeds() (gas: 870154)
+CurtaTest:test_setFermat_SetNonFermatPuzzle_Fails() (gas: 780207)
+CurtaTest:test_setFermat_SetSamePuzzleTwice_Fails() (gas: 456913)
+CurtaTest:test_setFermat_SetUnsolvedPuzzle_Fails() (gas: 300144)
+CurtaTest:test_setPuzzleColors() (gas: 306229)
+CurtaTest:test_setPuzzleColors_SetUnauthoredPuzzle_RevertsUnauthorized() (gas: 299507)
+CurtaTest:test_solve() (gas: 657540)
+CurtaTest:test_solve_DuringAllPhases_FirstSolveTimestampOnlySetOnFirstBlood(uint40) (runs: 256, μ: 520949, ~: 520275)
+CurtaTest:test_solve_DuringPhase1WithPayment_PaysAuthor(uint256) (runs: 256, μ: 495665, ~: 496974)
+CurtaTest:test_solve_DuringPhase2WithPayment_PaysAuthor(uint256) (runs: 256, μ: 533897, ~: 533897)
+CurtaTest:test_solve_DuringPhase2_RequiresETH(uint256) (runs: 256, μ: 489406, ~: 487644)
+CurtaTest:test_solve_DuringPhase3_Fails(uint40) (runs: 256, μ: 434098, ~: 434098)
+CurtaTest:test_solve_FirstBlood_AuthorshipTokenMintPotentialRevertBranch() (gas: 311249)
+CurtaTest:test_solve_FirstBlood_MintsAuthorshipToken() (gas: 413358)
+CurtaTest:test_solve_FirstBlood_UpdatesFirstSolveTimestamp(uint40) (runs: 256, μ: 407340, ~: 407340)
+CurtaTest:test_solve_IncorrectSolution_Fails(uint256) (runs: 256, μ: 309250, ~: 309250)
 CurtaTest:test_solve_NonExistantPuzzle_Fails() (gas: 13650)
-CurtaTest:test_solve_SamePuzzleTwice_Fails() (gas: 406056)
-CurtaTest:test_solve_Success_MintsFlag() (gas: 407737)
-CurtaTest:test_solve_Success_UpdatesSolveCounters() (gas: 612407)
-CurtaTest:test_solve_Success_UpdatesStorage() (gas: 406659)
+CurtaTest:test_solve_SamePuzzleTwice_Fails() (gas: 407397)
+CurtaTest:test_solve_Success_MintsFlag() (gas: 409078)
+CurtaTest:test_solve_Success_UpdatesSolveCounters() (gas: 613748)
+CurtaTest:test_solve_Success_UpdatesStorage() (gas: 408000)
 CurtaTest:test_supportsInterface() (gas: 8058)
 CurtaTest:test_tokenURI_MintedToken_Succeeds() (gas: 234)
-CurtaTest:test_tokenURI_UnmintedToken_Fails() (gas: 11378)
-CurtaTest:test_transferFrom() (gas: 449268)
-CurtaTest:test_transferFrom_SenderIsOwner_AllowsTransfer() (gas: 433241)
-CurtaTest:test_transferFrom_ToZeroAddress_Fails() (gas: 406595)
-CurtaTest:test_transferFrom_Unauthorized_RevertsUnauthorized() (gas: 411497)
-CurtaTest:test_transferFrom_WithApprovalForAllTrue_AllowsTransfer() (gas: 459002)
-CurtaTest:test_transferFrom_WithTokenApproval_AllowsTransfer() (gas: 439426)
-CurtaTest:test_transferFrom_WrongFrom_Fails() (gas: 406517)
+CurtaTest:test_tokenURI_UnmintedToken_Fails() (gas: 12952)
+CurtaTest:test_transferFrom() (gas: 450609)
+CurtaTest:test_transferFrom_SenderIsOwner_AllowsTransfer() (gas: 434582)
+CurtaTest:test_transferFrom_ToZeroAddress_Fails() (gas: 407936)
+CurtaTest:test_transferFrom_Unauthorized_RevertsUnauthorized() (gas: 412838)
+CurtaTest:test_transferFrom_WithApprovalForAllTrue_AllowsTransfer() (gas: 460343)
+CurtaTest:test_transferFrom_WithTokenApproval_AllowsTransfer() (gas: 440767)
+CurtaTest:test_transferFrom_WrongFrom_Fails() (gas: 407858)
 DeployConstellationTest:test_AddressInitializationCorrectness() (gas: 23494)
 DeployConstellationTest:test_authorshipTokenAuthorsEquality() (gas: 20777)
 DeployConstellationTest:test_authorshipTokenIssueLengthEquality() (gas: 11460)
@@ -68,4 +68,4 @@ DeployMainnetTest:test_authorshipTokenIssueLengthEquality() (gas: 11460)
 DeployMainnetTest:test_authorshipTokenMinting() (gas: 91601)
 DeployMainnetTest:test_authorshipTokenOwnerEquality() (gas: 13799)
 DeployMainnetTest:test_curtaOwnerEquality() (gas: 13832)
-OptimizationsTest:testFuzzComputePhaseFromTimestampBranchlessOptimization(uint40,uint40) (runs: 256, μ: 3534, ~: 3531)
\ No newline at end of file
+OptimizationsTest:testFuzzComputePhaseFromTimestampBranchlessOptimization(uint40,uint40) (runs: 256, μ: 3545, ~: 3531)
\ No newline at end of file