diff --git a/src/sh/generate-links.sh b/src/sh/generate-links.sh
new file mode 100644
index 000000000..d059b95da
--- /dev/null
+++ b/src/sh/generate-links.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+url="https://emojicoin.fun/generate-qr-code"
+
+for _ in $(seq 1 "$2");do
+	private="$(openssl genpkey -algorithm ED25519)"
+	public="$(echo "$private" | openssl pkey -pubout)"
+	formated_private="$(echo "$private" | head -n 2 | tail -n 1)"
+	formated_public="$(echo "$public" | head -n 2 | tail -n 1)"
+	echo "$formated_private,$formated_public,$url/$(echo -n "$formated_private" | base64 | jq -sRr @uri)" >> "$3"
+done
+
+publics="$(awk -F',' '{print $2}' "$3" | od -An -v -td1 | xargs -I _ echo "[_]" | tr -s ' \n' ',' | sed -E 's/^,(.*),$/\1/g' | tr '\n' ',' | sed -E 's/^(.*),$/\1/g')"
+
+echo "aptos move run --function-id \"$1\"::emojicoin_dot_fun_claim_link::add_public_keys_and_fund_gas_escrows --args \"u8:[$publics]\" u64:10000000"
diff --git a/src/typescript/frontend/src/app/generate-qr-code/page.tsx b/src/typescript/frontend/src/app/generate-qr-code/page.tsx
index c43313b75..e984f8ac2 100644
--- a/src/typescript/frontend/src/app/generate-qr-code/page.tsx
+++ b/src/typescript/frontend/src/app/generate-qr-code/page.tsx
@@ -1,19 +1,11 @@
 "use client";
 
 import Link from "next/link";
-import { useMemo, useState } from "react";
+import { useState } from "react";
 import "./module.css";
-import { stringifyJSON } from "utils";
-import { type FreeSwapData } from "@/store/user-settings-store";
 
 export default function GenerateQRCode() {
-  const [feePayerKey, setFeePayerKey] = useState<string>("");
-  const [claimCode, setClaimCode] = useState<string>("");
-
-  const data = useMemo(() => {
-    const pathData: FreeSwapData = { claimCode, feePayerKey };
-    return btoa(stringifyJSON(pathData));
-  }, [feePayerKey, claimCode]);
+  const [claimKey, setClaimKey] = useState<string>("");
 
   return (
     <div className="h-[100%] w-[100%] grid items-center">
@@ -21,26 +13,15 @@ export default function GenerateQRCode() {
         <textarea
           autoFocus={true}
           rows={4}
-          placeholder={"Fee payer key..."}
-          value={feePayerKey}
-          onChange={(v) => setFeePayerKey(v.currentTarget.value.replace(/\n/g, ""))}
-          className="bg-black text-3xl outline-none text-ec-blue p-[10px]"
-          style={{
-            border: "3px dashed var(--ec-blue)",
-          }}
-        />
-        <textarea
-          autoFocus={true}
-          rows={4}
-          placeholder={"Claim code..."}
-          value={claimCode}
-          onChange={(v) => setClaimCode(v.currentTarget.value.replace(/\n/g, ""))}
+          placeholder={"Claim key..."}
+          value={claimKey}
+          onChange={(v) => setClaimKey(v.currentTarget.value.replace(/\n/g, ""))}
           className="bg-black text-3xl outline-none text-ec-blue p-[10px]"
           style={{
             border: "3px dashed var(--ec-blue)",
           }}
         />
-        <Link href={`/generate-qr-code/${encodeURIComponent(data)}`}>
+        <Link href={`/generate-qr-code/${encodeURIComponent(claimKey)}`}>
           <button
             type="submit"
             className="text-ec-blue text-3xl uppercase w-[100%] p-[4px]"
diff --git a/src/typescript/frontend/src/app/redeem/[data]/page.tsx b/src/typescript/frontend/src/app/redeem/[data]/page.tsx
index 0ac297b66..331579a4f 100644
--- a/src/typescript/frontend/src/app/redeem/[data]/page.tsx
+++ b/src/typescript/frontend/src/app/redeem/[data]/page.tsx
@@ -1,10 +1,8 @@
 "use client";
 
-import { type FreeSwapData } from "@/store/user-settings-store";
 import { useUserSettings } from "context/event-store-context";
 import { redirect } from "next/navigation";
-import { useEffect, useMemo } from "react";
-import { parseJSON } from "utils";
+import { useEffect } from "react";
 
 interface PageProps {
   params: {
@@ -14,18 +12,15 @@ interface PageProps {
 }
 
 export default function GenerateQRCode(props: PageProps) {
-  const data = decodeURIComponent(props.params.data);
-  const setFreeSwap = useUserSettings((s) => s.setFreeSwapData);
-  const freeSwapData: FreeSwapData = useMemo(() => {
-    return parseJSON(atob(data));
-  }, [data]);
+  const claimKey = decodeURIComponent(props.params.data);
+  const setClaimKey = useUserSettings((s) => s.setClaimKey);
 
   useEffect(() => {
-    if (setFreeSwap) {
-      setFreeSwap(freeSwapData);
+    if (setClaimKey) {
+      setClaimKey(claimKey);
       redirect("/home");
     }
-  }, [freeSwapData, setFreeSwap]);
+  }, [claimKey, setClaimKey]);
 
   return (
     <div className="h-[100%] w-[100%] block content-center">
diff --git a/src/typescript/frontend/src/components/pages/emojicoin/components/trade-emojicoin/SwapButton.tsx b/src/typescript/frontend/src/components/pages/emojicoin/components/trade-emojicoin/SwapButton.tsx
index b52ea1629..0862f99ce 100644
--- a/src/typescript/frontend/src/components/pages/emojicoin/components/trade-emojicoin/SwapButton.tsx
+++ b/src/typescript/frontend/src/components/pages/emojicoin/components/trade-emojicoin/SwapButton.tsx
@@ -6,7 +6,11 @@ import { useAptos } from "context/wallet-context/AptosContextProvider";
 import { toCoinTypes } from "@sdk/markets/utils";
 import { type AccountAddressString } from "@sdk/emojicoin_dot_fun";
 import { type Dispatch, type SetStateAction, useEffect, useCallback } from "react";
-import { Ed25519PrivateKey, isUserTransactionResponse } from "@aptos-labs/ts-sdk";
+import {
+  Account,
+  Ed25519PrivateKey,
+  isUserTransactionResponse,
+} from "@aptos-labs/ts-sdk";
 import { STRUCT_STRINGS } from "@sdk/utils";
 import { useAnimationControls } from "framer-motion";
 import { RewardsAnimation } from "./RewardsAnimation";
@@ -44,8 +48,8 @@ export const SwapButton = ({
   const controls = useAnimationControls();
   const { canTrade } = useCanTradeMarket(symbol);
 
-  const freeSwapData = useUserSettings((s) => s.freeSwapData);
-  const setFreeSwapData = useUserSettings((s) => s.setFreeSwapData);
+  const claimKey = useUserSettings((s) => s.claimKey);
+  const setFreeSwapData = useUserSettings((s) => s.setClaimKey);
 
   const handleClick = useCallback(async () => {
     if (!account) {
@@ -54,9 +58,10 @@ export const SwapButton = ({
     let builderLambda: () => Promise<EntryFunctionTransactionBuilder>;
     const { emojicoin, emojicoinLP } = toCoinTypes(marketAddress);
     try {
-      if (freeSwapData !== undefined) {
-        const privateKey = new Ed25519PrivateKey(freeSwapData.feePayerKey);
+      if (claimKey !== undefined) {
+        const privateKey = new Ed25519PrivateKey(Buffer.from(claimKey, "base64").subarray(16));
         const publicKey = privateKey.publicKey();
+        const feePayerAccount = Account.fromPrivateKey({ privateKey });
         builderLambda = () =>
           Redeem.builder({
             aptosConfig: aptos.config,
@@ -66,7 +71,7 @@ export const SwapButton = ({
             marketAddress,
             typeTags: [emojicoin, emojicoinLP],
             minOutputAmount: BigInt(minOutputAmount),
-            feePayer: freeSwapData.feePayerKey,
+            feePayer: feePayerAccount.accountAddress,
           });
       } else {
         builderLambda = () =>
@@ -118,7 +123,7 @@ export const SwapButton = ({
     submit,
     controls,
     minOutputAmount,
-    freeSwapData,
+    claimKey,
     setFreeSwapData,
   ]);
 
diff --git a/src/typescript/frontend/src/components/pages/emojicoin/components/trade-emojicoin/SwapComponent.tsx b/src/typescript/frontend/src/components/pages/emojicoin/components/trade-emojicoin/SwapComponent.tsx
index 3f0c0e6c8..42b17e2d4 100644
--- a/src/typescript/frontend/src/components/pages/emojicoin/components/trade-emojicoin/SwapComponent.tsx
+++ b/src/typescript/frontend/src/components/pages/emojicoin/components/trade-emojicoin/SwapComponent.tsx
@@ -67,7 +67,7 @@ export default function SwapComponent({
   const { t } = translationFunction();
   const searchParams = useSearchParams();
 
-  const hasFreeSwap = useUserSettings((s) => s.freeSwapData !== undefined);
+  const hasFreeSwap = useUserSettings((s) => s.claimKey !== undefined);
 
   const claimAmount = useClaimAmount() / ONE_APT;
 
diff --git a/src/typescript/frontend/src/components/price-feed/inner.tsx b/src/typescript/frontend/src/components/price-feed/inner.tsx
index 9d65ea35f..66a417e46 100644
--- a/src/typescript/frontend/src/components/price-feed/inner.tsx
+++ b/src/typescript/frontend/src/components/price-feed/inner.tsx
@@ -22,7 +22,7 @@ const Item = ({ emoji, change }: { emoji: string; change: number }) => {
 };
 
 export const PriceFeedInner = ({ data }: { data: Awaited<ReturnType<typeof fetchPriceFeed>> }) => {
-  const hasFreeSwap = useUserSettings((s) => s.freeSwapData !== undefined);
+  const hasFreeSwap = useUserSettings((s) => s.claimKey !== undefined);
   return !hasFreeSwap ? (
     <div className="w-full z-[10] relative">
       <Carousel>
diff --git a/src/typescript/frontend/src/components/rewards-banner.tsx b/src/typescript/frontend/src/components/rewards-banner.tsx
index b405313ef..09a81d035 100644
--- a/src/typescript/frontend/src/components/rewards-banner.tsx
+++ b/src/typescript/frontend/src/components/rewards-banner.tsx
@@ -4,7 +4,7 @@ import { useUserSettings } from "context/event-store-context";
 import Carousel from "components/carousel";
 
 export const RewardsBanner = () => {
-  const hasFreeSwap = useUserSettings((s) => s.freeSwapData !== undefined);
+  const hasFreeSwap = useUserSettings((s) => s.claimKey !== undefined);
   return hasFreeSwap ? (
     <div className="w-full z-[10] relative">
       <Carousel>
diff --git a/src/typescript/frontend/src/lib/store/user-settings-store.ts b/src/typescript/frontend/src/lib/store/user-settings-store.ts
index 7390d25a1..a34f874f7 100644
--- a/src/typescript/frontend/src/lib/store/user-settings-store.ts
+++ b/src/typescript/frontend/src/lib/store/user-settings-store.ts
@@ -2,20 +2,15 @@ import { LOCAL_STORAGE_KEYS } from "configs";
 import { parseJSON, stringifyJSON } from "utils";
 import { createStore } from "zustand";
 
-export type FreeSwapData = {
-  claimCode: string;
-  feePayerKey: string;
-};
-
 export type UserSettingsState = {
   animate: boolean;
-  freeSwapData: FreeSwapData | undefined;
+  claimKey: string | undefined;
 };
 
 export type UserSettingsActions = {
   setAnimate: (value: boolean) => void;
   toggleAnimate: () => void;
-  setFreeSwapData: (freeSwapData: FreeSwapData | undefined) => void;
+  setClaimKey: (claimKey: string | undefined) => void;
 };
 
 export type UserSettingsStore = UserSettingsState & UserSettingsActions;
@@ -26,7 +21,7 @@ const saveSettings = (state: UserSettingsStore) => {
 
 const defaultValues: UserSettingsState = {
   animate: true,
-  freeSwapData: undefined,
+  claimKey: undefined,
 };
 
 const readSettings = (): UserSettingsState => {
@@ -57,9 +52,9 @@ export const createUserSettingsStore = () =>
         saveSettings(state);
         return state;
       }),
-    setFreeSwapData: (freeSwapData) =>
+    setClaimKey: (claimKey) =>
       set((state) => {
-        state.freeSwapData = freeSwapData;
+        state.claimKey = claimKey;
         saveSettings(state);
         return state;
       }),
diff --git a/src/typescript/sdk/src/emojicoin_dot_fun/payload-builders.ts b/src/typescript/sdk/src/emojicoin_dot_fun/payload-builders.ts
index 5a60f0e9a..bb6179d31 100644
--- a/src/typescript/sdk/src/emojicoin_dot_fun/payload-builders.ts
+++ b/src/typescript/sdk/src/emojicoin_dot_fun/payload-builders.ts
@@ -120,6 +120,7 @@ export class EntryFunctionTransactionBuilder {
 /* eslint-disable-next-line import/no-unused-modules */
 export type WalletInputTransactionData = {
   sender?: AccountAddressInput;
+  feePayer?: AccountAddressInput;
   // For now we only use entry functions. Eventually we could support script functions, too.
   data: InputEntryFunctionData;
   options?: InputGenerateTransactionOptions;
@@ -173,6 +174,7 @@ export abstract class EntryFunctionPayloadBuilder extends Serializable {
 
     return {
       sender: this.primarySender,
+      feePayer: this.feePayer,
       data: {
         ...multiSigData,
         function: `${this.moduleAddress.toString()}::${this.moduleName}::${this.functionName}`,