diff --git a/README.md b/README.md
index 87dead6..2765943 100644
--- a/README.md
+++ b/README.md
@@ -80,6 +80,33 @@
   - OFT Config: `BG9oPj76NRPbj1e1GbL4imnqo9VD7W2ukpnRFSWtq5CA`
     - As bytes32: `0x9876880bee04a9020e619b1be124ee307e03ca94bab4f32a7a22cfd2ccee3927`
 
+### Solana
+- Admin: Chain-respective msig
+- `FRAX`
+  - SPL Token: B4Ds2fCbxjSiVLNyGQd44htvvNuVxzdoJSxNsRv3nxpE
+  - OFT Config: 7pw5h3gc4LQCGPdq9qsqCdBDt6vtyk5CWjL9spsjp7Sa
+    - As bytes32: 0x656d91ab3d464c05cd1345ce21c78e36140a36491e102fbb08c58af73aafe89b
+- `sFrax`
+  - SPL Token: DnVyztLHnDyTqL3xfPYF9Uqpgrhcxphn6e31sVAwtg6K
+  - OFT Config: 3BcysJF4fQx86fVTDTBGNpZyRpeMyTF8XsuvPHJQuP3V
+    - As bytes32: 0x206fdd7d0be90d8ff93f6f7f4bd4d8b42ca8977317da0b7d2861299e3c589dd8
+- `sfrxETH`
+  - SPL Token: 6iHW2j5dvW8EiEVSXqQFjm7c5xNd4MdYuXLrW3eQ1UYw
+  - OFT Config: 8AdTghMT8yyNpWrTuPoDjrtXW7t1YEZgLVjWDftWfCxo
+    - As bytes32: 0x6a7942e4eb4938d5490d8187183d01123f515025f4244670aff7f8ecd2250d50
+- `FXS`
+  - SPL Token: 8QRvtWw4XYQW7UqTiGhzyWZkhCqSwZDA5qjRWDotSZ4e
+  - OFT Config: 5KYEyuA1cAdnZFj4i6zUjTEre4s7snacyXbkTmNqLjJs
+    - As bytes32: 0x402e86d1cfd2cde4fac63aa8d9892eca6d3c0e08e8335622124332a95df6c10c
+- `frxETH`
+  - SPL Token: CuXHLCxCcyPkmbemPxh7PAWedfFffeL82b6VPJmonTaa
+  - OFT Config: AzaSy9yr44e4bnWNdrNkxmye1kEYmbbgGfY8a3ZqzuMf
+    - As bytes32: 0x94791ba0aae2b57460c63d36346392d849b22f39fd3eafad5bc82d01e352dde6
+- `FPI`
+  - SPL Token: FqRC7vNLS3ubbhtdqNSz8Q5ei8VdUxF6H6eoXQLHxihr
+  - OFT Config: BG9oPj76NRPbj1e1GbL4imnqo9VD7W2ukpnRFSWtq5CA
+    - As bytes32: 0x9876880bee04a9020e619b1be124ee307e03ca94bab4f32a7a22cfd2ccee3927
+
 ## New Chain Deployment
 - Ensure `PK_OFT_DEPLOYER` and `PK_CONFIG_DEPLOYER` are the private keys for `0x9C9dD956b413cdBD81690c9394a6B4D22afe6745` and `0x0990be6dB8c785FBbF9deD8bAEc612A10CaE814b`, respectively.
 - Modify `.env` `RPC_URL` to the new chain RPC
diff --git a/scripts/BaseL0Script.sol b/scripts/BaseL0Script.sol
index 2279718..aadfa4d 100644
--- a/scripts/BaseL0Script.sol
+++ b/scripts/BaseL0Script.sol
@@ -51,11 +51,24 @@ contract BaseL0Script is Script {
     }
     L0Config[] public legacyConfigs;
     L0Config[] public proxyConfigs;
-    L0Config[] public configs; // legacy & proxy configs
+    L0Config[] public evmConfigs;
+    L0Config[] public nonEvmConfigs;
+    L0Config[] public allConfigs; // legacy, proxy, and non-evm allConfigs
     L0Config public broadcastConfig; // config of actively-connected (broadcasting) chain
     L0Config public simulateConfig;  // Config of the simulated chain
     L0Config[] public broadcastConfigArray; // length of 1 of broadcastConfig
-    bool public activeLegacy; // true if we're broadcasting to legacy chain
+    bool public activeLegacy; // true if we're broadcasting to legacy chain (setup by L0 team)
+
+    /// @dev alphabetical order as json is read in by keys alphabetically.
+    struct NonEvmPeer {
+        bytes32 fpi;
+        bytes32 frax;
+        bytes32 frxEth;
+        bytes32 fxs;
+        bytes32 sFrax;
+        bytes32 sFrxEth;
+    }
+    bytes32[][] public nonEvmPeersArrays;
 
     // Mock implementation used to enable pre-determinsitic proxy creation
     address public implementationMock;
@@ -73,9 +86,9 @@ contract BaseL0Script is Script {
     // 1:1 match between these arrays for setting peers
     address[] public legacyOfts;
     address[] public expectedProxyOfts; // to assert against proxyOfts
-    address[] public proxyOfts;
+    address[] public proxyOfts; // the OFTs deployed through `DeployFraxOFTProtocol.s.sol`
 
-    EnforcedOptionParam[] public enforcedOptionsParams;
+    EnforcedOptionParam[] public enforcedOptionParams;
 
     SetConfigParam[] public setConfigParams;
 
@@ -84,7 +97,7 @@ contract BaseL0Script is Script {
     string public json;
 
     function version() public virtual pure returns (uint256, uint256, uint256) {
-        return (1, 1, 3);
+        return (1, 2, 0);
     }
 
     modifier broadcastAs(uint256 privateKey) {
@@ -97,7 +110,7 @@ contract BaseL0Script is Script {
         L0Config memory _simulateConfig
     ) virtual {
         // Clear out any previous txs
-        delete enforcedOptionsParams;
+        delete enforcedOptionParams;
         delete setConfigParams;
         delete serializedTxs;
 
@@ -148,10 +161,11 @@ contract BaseL0Script is Script {
 
     function loadJsonConfig() public virtual {
         string memory root = vm.projectRoot();
+        
+        // L0Config.json
+
         string memory path = string.concat(root, "/scripts/L0Config.json");
         json = vm.readFile(path);
-        
-        // load and write to persistent storage
 
         // legacy
         L0Config[] memory legacyConfigs_ = abi.decode(json.parseRaw(".Legacy"), (L0Config[]));
@@ -163,7 +177,8 @@ contract BaseL0Script is Script {
                 activeLegacy = true;
             }
             legacyConfigs.push(config_);
-            configs.push(config_);
+            allConfigs.push(config_);
+            evmConfigs.push(config_);
         }
 
         // proxy (active deployment loaded as broadcastConfig)
@@ -176,10 +191,39 @@ contract BaseL0Script is Script {
                 activeLegacy = false;
             }
             proxyConfigs.push(config_);
-            configs.push(config_);
+            allConfigs.push(config_);
+            evmConfigs.push(config_);
+        }
+
+        // Non-EVM allConfigs
+        /// @dev as foundry cannot deploy to non-evm, a non-evm chain will never be the active/connected chain
+        L0Config[] memory nonEvmConfigs_ = abi.decode(json.parseRaw(".Non-EVM"), (L0Config[]));
+        for (uint256 i=0; i<nonEvmConfigs_.length; i++) {
+            L0Config memory config_ = nonEvmConfigs_[i];
+            nonEvmConfigs.push(config_);
+            allConfigs.push(config_);
+        }
+
+        // NonEvmPeers.json
+
+        path = string.concat(root, "/scripts/NonEvmPeers.json");
+        json = vm.readFile(path);
+
+        NonEvmPeer[] memory nonEvmPeers = abi.decode(json.parseRaw(".Peers"), (NonEvmPeer[]));
+        
+        // As json has to be ordered alphabetically, sort the peer addresses in the order of OFT deployment
+        for (uint256 i=0; i<nonEvmPeers.length; i++) {
+            NonEvmPeer memory peer = nonEvmPeers[i];
+            bytes32[] memory peerArray = new bytes32[](6);
+            peerArray[0] = peer.fxs;
+            peerArray[1] = peer.sFrax;
+            peerArray[2] = peer.sFrxEth;
+            peerArray[3] = peer.frax;
+            peerArray[4] = peer.frxEth;
+            peerArray[5] = peer.fpi;
+
+            nonEvmPeersArrays.push(peerArray);
         }
-        require(broadcastConfig.chainid != 0, "L0Config not set for broadcastConfig");
-        require(broadcastConfigArray.length == 1, "broadcastConfigArray does not equal 1");
     }
 
     function isStringEqual(string memory _a, string memory _b) public pure returns (bool) {
diff --git a/scripts/DeployFraxOFTProtocol/DeployFraxOFTProtocol.s.sol b/scripts/DeployFraxOFTProtocol/DeployFraxOFTProtocol.s.sol
index 697ab9b..2490115 100644
--- a/scripts/DeployFraxOFTProtocol/DeployFraxOFTProtocol.s.sol
+++ b/scripts/DeployFraxOFTProtocol/DeployFraxOFTProtocol.s.sol
@@ -17,7 +17,7 @@ contract DeployFraxOFTProtocol is BaseL0Script {
     using Strings for uint256;
 
     function version() public virtual override pure returns (uint256, uint256, uint256) {
-        return (1, 1, 2);
+        return (1, 2, 0);
     }
 
     function setUp() public virtual override {
@@ -65,60 +65,79 @@ contract DeployFraxOFTProtocol is BaseL0Script {
         L0Config memory _connectedConfig,
         address[] memory _connectedOfts
     ) public virtual simulateAndWriteTxs(_connectedConfig) {
-        setEnforcedOptions({
+        setEvmEnforcedOptions({
             _connectedOfts: _connectedOfts,
             _configs: broadcastConfigArray
         });
 
-        setDVNs({
-            _connectedConfig: _connectedConfig,
+        setEvmPeers({
             _connectedOfts: _connectedOfts,
-            _configs: broadcastConfigArray
+            _peerOfts: proxyOfts,
+            _configs: broadcastConfigArray 
         });
 
-        setPeers({
+        setDVNs({
+            _connectedConfig: _connectedConfig,
             _connectedOfts: _connectedOfts,
-            _peerOfts: proxyOfts,
             _configs: broadcastConfigArray
         });
     }
 
     function setupSource() public virtual broadcastAs(configDeployerPK) {
-        // TODO: this will break if proxyOFT addrs are not the pre-determined addrs verified in postDeployChecks()
-        setEnforcedOptions({
-            _connectedOfts: proxyOfts,
-            _configs: configs
-        });
+        /// @dev set enforced options / peers separately
+        setupEvms();
+        setupNonEvms();
 
         setDVNs({
             _connectedConfig: broadcastConfig,
             _connectedOfts: proxyOfts,
-            _configs: configs
+            _configs: allConfigs
+        });
+
+        setPriviledgedRoles();
+    }
+
+    function setupEvms() public virtual {
+        setEvmEnforcedOptions({
+            _connectedOfts: proxyOfts,
+            _configs: evmConfigs
         });
 
         /// @dev legacy, non-upgradeable OFTs
-        setPeers({
+        setEvmPeers({
             _connectedOfts: proxyOfts,
             _peerOfts: legacyOfts,
             _configs: legacyConfigs
         });
         /// @dev Upgradeable OFTs maintaining the same address cross-chain.
-        setPeers({
+        setEvmPeers({
             _connectedOfts: proxyOfts,
             _peerOfts: proxyOfts,
             _configs: proxyConfigs
         });
+    }
 
-        setPriviledgedRoles();
+    function setupNonEvms() public virtual {
+        require(proxyOfts.length == 6, "Error: non-evm setup will be incorrect");
+
+        setSolanaEnforcedOptions({
+            _connectedOfts: proxyOfts
+        });
+        
+        /// @dev: additional enforced options for non-evms set here
+
+        setNonEvmPeers({
+            _connectedOfts: proxyOfts
+        });
     }
 
     function preDeployChecks() public virtual view {
-        for (uint256 e=0; e<configs.length; e++) {
-            uint256 eid = configs[e].eid;    
+        for (uint256 e=0; e<allConfigs.length; e++) {
+            uint256 eid = allConfigs[e].eid;    
             // source and dest eid cannot be same
             if (eid == broadcastConfig.eid) continue;
             require(
-                IMessageLibManager(broadcastConfig.endpoint).isSupportedEid(uint32(configs[e].eid)),
+                IMessageLibManager(broadcastConfig.endpoint).isSupportedEid(uint32(allConfigs[e].eid)),
                 "L0 team required to setup `defaultSendLibrary` and `defaultReceiveLibrary` for EID"
             );
         }
@@ -264,40 +283,69 @@ contract DeployFraxOFTProtocol is BaseL0Script {
     }
 
     /// @dev _connectedOfts refers to the OFTs of the RPC we are currently connected to
-    function setPeers(
+    function setEvmPeers(
         address[] memory _connectedOfts,
         address[] memory _peerOfts,
         L0Config[] memory _configs
     ) public virtual {
         require(_connectedOfts.length == _peerOfts.length, "Must wire equal amount of source + dest addrs");
+        // For each OFT
         for (uint256 o=0; o<_connectedOfts.length; o++) {
-            address connectedOft = _connectedOfts[o];
-            address peerOft = _peerOfts[o];
+            // Set the config per chain
             for (uint256 c=0; c<_configs.length; c++) {
-                // cannot set peer to self
-                if (block.chainid == _configs[c].chainid) continue;
-
-                bytes memory data = abi.encodeCall(
-                    IOAppCore.setPeer,
-                    (
-                        uint32(_configs[c].eid), addressToBytes32(peerOft)
-                    )
-                );
-                (bool success, ) = connectedOft.call(data);
-                require(success, "Unable to setPeer");
-                serializedTxs.push(
-                    SerializedTx({
-                        name: "setPeer",
-                        to: connectedOft,
-                        value: 0,
-                        data: data
-                    })
-                );
+                setPeer({
+                    _config: _configs[c],
+                    _connectedOft: _connectedOfts[o],
+                    _peerOftAsBytes32: addressToBytes32(_peerOfts[o])
+                });
             }
         }
     }
 
-    function setEnforcedOptions(
+    /// @dev Non-evm OFTs require their own unique peer address
+    function setNonEvmPeers(
+        address[] memory _connectedOfts
+    ) public virtual {
+        // Set the peer per OFT
+        for (uint256 o=0; o<_connectedOfts.length; o++) {
+            // For each non-evm
+            for (uint256 c=0; c<nonEvmPeersArrays.length; c++) {
+                setPeer({
+                    _config: broadcastConfig,
+                    _connectedOft: _connectedOfts[o],
+                    _peerOftAsBytes32: nonEvmPeersArrays[c][o]
+                });
+            }
+        }
+    }
+
+    function setPeer(
+        L0Config memory _config,
+        address _connectedOft,
+        bytes32 _peerOftAsBytes32
+    ) public virtual {
+        // cannot set peer to self
+        if (block.chainid == _config.chainid) return;
+
+        bytes memory data = abi.encodeCall(
+            IOAppCore.setPeer,
+            (
+                uint32(_config.eid), _peerOftAsBytes32
+            )
+        );
+        (bool success, ) = _connectedOft.call(data);
+        require(success, "Unable to setPeer");
+        serializedTxs.push(
+            SerializedTx({
+                name: "setPeer",
+                to: _connectedOft,
+                value: 0,
+                data: data
+            })
+        );
+    }
+
+    function setEvmEnforcedOptions(
         address[] memory _connectedOfts,
         L0Config[] memory _configs
     ) public virtual {
@@ -306,35 +354,77 @@ contract DeployFraxOFTProtocol is BaseL0Script {
         bytes memory optionsTypeOne = OptionsBuilder.newOptions().addExecutorLzReceiveOption(200_000, 0);
         bytes memory optionsTypeTwo = OptionsBuilder.newOptions().addExecutorLzReceiveOption(250_000, 0);
 
+        setEnforcedOptions({
+            _connectedOfts: _connectedOfts,
+            _configs: _configs,
+            _optionsTypeOne: optionsTypeOne,
+            _optionsTypeTwo: optionsTypeTwo
+        });
+    }
+
+    function setSolanaEnforcedOptions(
+        address[] memory _connectedOfts
+    ) public virtual {
+        bytes memory optionsTypeOne = OptionsBuilder.newOptions().addExecutorLzReceiveOption(200_000, 2_500_000);
+        bytes memory optionsTypeTwo = OptionsBuilder.newOptions().addExecutorLzReceiveOption(200_000, 2_500_000);
+
+        L0Config[] memory configs = new L0Config[](1);
+        configs[0] = nonEvmConfigs[0]; // mapped to solana
+
+        setEnforcedOptions({
+            _connectedOfts: _connectedOfts,
+            _configs: configs,
+            _optionsTypeOne: optionsTypeOne,
+            _optionsTypeTwo: optionsTypeTwo
+        });
+    }
+
+    function setEnforcedOptions(
+        address[] memory _connectedOfts,
+        L0Config[] memory _configs,
+        bytes memory _optionsTypeOne,
+        bytes memory _optionsTypeTwo
+    ) public virtual {
+        // clear out any pre-existing enforced options params
+        delete enforcedOptionParams;
+
+        // Build enforced options for each chain
         for (uint256 c=0; c<_configs.length; c++) {            
             // cannot set enforced options to self
             if (block.chainid == _configs[c].chainid) continue;
 
-            enforcedOptionsParams.push(EnforcedOptionParam(uint32(_configs[c].eid), 1, optionsTypeOne));
-            enforcedOptionsParams.push(EnforcedOptionParam(uint32(_configs[c].eid), 2, optionsTypeTwo));
+            enforcedOptionParams.push(EnforcedOptionParam(uint32(_configs[c].eid), 1, _optionsTypeOne));
+            enforcedOptionParams.push(EnforcedOptionParam(uint32(_configs[c].eid), 2, _optionsTypeTwo));
         }
 
         for (uint256 o=0; o<_connectedOfts.length; o++) {
-            address connectedOft = _connectedOfts[o];
-            bytes memory data = abi.encodeCall(
-                IOAppOptionsType3.setEnforcedOptions,
-                (
-                    enforcedOptionsParams
-                )
-            );
-            (bool success, ) = connectedOft.call(data);
-            require(success, "Unable to setEnforcedOptions");
-            serializedTxs.push(
-                SerializedTx({
-                    name: "setEnforcedOptions",
-                    to: connectedOft,
-                    value: 0,
-                    data: data
-                })
-            );
+            setEnforcedOption({
+                _connectedOft: _connectedOfts[o]
+            });
         }
     }
 
+    function setEnforcedOption(
+        address _connectedOft
+    ) public {
+        bytes memory data = abi.encodeCall(
+            IOAppOptionsType3.setEnforcedOptions,
+            (
+                enforcedOptionParams
+            )
+        );
+        (bool success, ) = _connectedOft.call(data);
+        require(success, "Unable to setEnforcedOptions");
+        serializedTxs.push(
+            SerializedTx({
+                name: "setEnforcedOptions",
+                to: _connectedOft,
+                value: 0,
+                data: data
+            })
+        );
+    }
+
     function setDVNs(
         L0Config memory _connectedConfig,
         address[] memory _connectedOfts,
@@ -354,7 +444,7 @@ contract DeployFraxOFTProtocol is BaseL0Script {
         }
         ulnConfig.requiredDVNs = requiredDVNs;
 
-        // push configs
+        // push allConfigs
         for (uint256 c=0; c<_configs.length; c++) {
             // cannot set enforced options to self
             if (block.chainid == _configs[c].chainid) continue;
diff --git a/scripts/FixDVNs/FixDVNs.s.sol b/scripts/FixDVNs/FixDVNs.s.sol
index 276a7a7..b83b95a 100644
--- a/scripts/FixDVNs/FixDVNs.s.sol
+++ b/scripts/FixDVNs/FixDVNs.s.sol
@@ -13,7 +13,7 @@ contract FixDVNs is DeployFraxOFTProtocol {
     using Strings for uint256;
 
     function version() public virtual override pure returns (uint256, uint256, uint256) {
-        return (1, 0, 1);
+        return (1, 0, 2);
     }
 
     /// @dev override to alter file save location
@@ -46,7 +46,7 @@ contract FixDVNs is DeployFraxOFTProtocol {
         setDVNs({
             _connectedConfig: broadcastConfig,
             _connectedOfts: proxyOfts,
-            _configs: configs
+            _configs: evmConfigs
         });
 
         // /// @dev legacy, non-upgradeable OFTs
diff --git a/scripts/FixDeployDVNs/FixDeployDVNs.s.sol b/scripts/FixDeployDVNs/FixDeployDVNs.s.sol
index 32c893f..bd8917b 100644
--- a/scripts/FixDeployDVNs/FixDeployDVNs.s.sol
+++ b/scripts/FixDeployDVNs/FixDeployDVNs.s.sol
@@ -17,7 +17,7 @@ contract FixDeployDVNs is DeployFraxOFTProtocol {
     using Strings for uint256;
 
     function version() public virtual override pure returns (uint256, uint256, uint256) {
-        return (1, 0, 1);
+        return (1, 0, 2);
     }
 
     /// @dev override to alter file save location
@@ -55,7 +55,7 @@ contract FixDeployDVNs is DeployFraxOFTProtocol {
         setDVNs({
             _connectedConfig: _connectedConfig,
             _connectedOfts: _connectedOfts,
-            _configs: configs
+            _configs: evmConfigs
         });
 
         // setPeers({
diff --git a/scripts/NonEvmPeers.json b/scripts/NonEvmPeers.json
new file mode 100644
index 0000000..6e2b51d
--- /dev/null
+++ b/scripts/NonEvmPeers.json
@@ -0,0 +1,13 @@
+{
+    "dev-note": "One-to-one mapping with L0Config.json#Non-EVM",
+    "Peers": [
+        {
+            "fpi": "0x9876880bee04a9020e619b1be124ee307e03ca94bab4f32a7a22cfd2ccee3927",
+            "frax": "0x656d91ab3d464c05cd1345ce21c78e356140a36491e102fbb08c58af73aafe89b",
+            "frxEth": "0x94791ba0aae2b57460c63d36346392d849b22f39fd3eafad5bc82d01e352dde6",
+            "fxs": "0x402e86d1cfd2cde4fac63aa8d9892eca6d3c0e08e8335622124332a95df6c10c",
+            "sFrax": "0x206fdd7d0be90d8ff93f6f7f4bd4d8b42ca8977317da0b7d2861299e3c589dd8",
+            "sFrxEth": "0x6a7942e4eb4938d5490d8187183d01123f515025f4244670aff7f8ecd2250d50"
+        }
+    ] 
+}
\ No newline at end of file
diff --git a/scripts/SetupSolana/SetupSolana.s.sol b/scripts/SetupSolana/SetupSolana.s.sol
index bba1692..9e0a427 100644
--- a/scripts/SetupSolana/SetupSolana.s.sol
+++ b/scripts/SetupSolana/SetupSolana.s.sol
@@ -19,7 +19,7 @@ contract SetupSolana is DeployFraxOFTProtocol {
     bytes32[] solanaPeers;
 
     function version() public virtual override pure returns (uint256, uint256, uint256) {
-        return (1, 0, 1);
+        return (1, 0, 2);
     }
 
     /// @dev comments out requirements at end and setting of broadcastConfig
@@ -40,7 +40,8 @@ contract SetupSolana is DeployFraxOFTProtocol {
             //     activeLegacy = true;
             // }
             legacyConfigs.push(config_);
-            configs.push(config_);
+            evmConfigs.push(config_);
+            allConfigs.push(config_);
         }
 
         // proxy (active deployment loaded as broadcastConfig)
@@ -53,7 +54,8 @@ contract SetupSolana is DeployFraxOFTProtocol {
             //     activeLegacy = false;
             // }
             proxyConfigs.push(config_);
-            configs.push(config_);
+            evmConfigs.push(config_);
+            allConfigs.push(config_);
         }
         // require(broadcastConfig.chainid != 0, "L0Config for source not loaded");
         // require(broadcastConfigArray.length == 1, "broadcastConfigArray does not equal 1");
@@ -119,7 +121,7 @@ contract SetupSolana is DeployFraxOFTProtocol {
     function setEnforcedOptions(
         address[] memory _connectedOfts,
         L0Config[] memory _configs
-    ) public override {
+    ) public {
         // For each peer, default
         // https://github.com/FraxFinance/LayerZero-v2-upgradeable/blob/e1470197e0cffe0d89dd9c776762c8fdcfc1e160/oapp/test/OFT.t.sol#L417
         bytes memory optionsTypeOne = OptionsBuilder.newOptions().addExecutorLzReceiveOption(200_000, 2_500_000);
@@ -131,8 +133,8 @@ contract SetupSolana is DeployFraxOFTProtocol {
             // cannot set enforced options to self
             if (block.chainid == _configs[c].chainid) continue;
 
-            enforcedOptionsParams.push(EnforcedOptionParam(eid, 1, optionsTypeOne));
-            enforcedOptionsParams.push(EnforcedOptionParam(eid, 2, optionsTypeTwo));
+            enforcedOptionParams.push(EnforcedOptionParam(eid, 1, optionsTypeOne));
+            enforcedOptionParams.push(EnforcedOptionParam(eid, 2, optionsTypeTwo));
         }
 
         for (uint256 o=0; o<_connectedOfts.length; o++) {
@@ -140,7 +142,7 @@ contract SetupSolana is DeployFraxOFTProtocol {
             bytes memory data = abi.encodeCall(
                 IOAppOptionsType3.setEnforcedOptions,
                 (
-                    enforcedOptionsParams
+                    enforcedOptionParams
                 )
             );
             (bool success, ) = connectedOft.call(data);
diff --git a/scripts/SubmitSends/SubmitSends.s.sol b/scripts/SubmitSends/SubmitSends.s.sol
index 87be6db..ee7d533 100644
--- a/scripts/SubmitSends/SubmitSends.s.sol
+++ b/scripts/SubmitSends/SubmitSends.s.sol
@@ -29,13 +29,13 @@ contract SubmitSends is BaseL0Script {
     function submitSends(
         address[] memory _connectedOfts
     ) public {
-        for (uint256 c=0; c<configs.length; c++) {
+        for (uint256 c=0; c<allConfigs.length; c++) {
             // Do not send if the target chain == active chain
-            if (configs[c].chainid == broadcastConfig.chainid) {
+            if (allConfigs[c].chainid == broadcastConfig.chainid) {
                 continue;
             }
             for (uint256 o=0; o<_connectedOfts.length; o++) {
-                submitSend(configs[c], _connectedOfts[o]);
+                submitSend(allConfigs[c], _connectedOfts[o]);
             }
         }
     }