diff --git a/docs/gram/examples/assets/add-function-to-toolset.png b/docs/gram/examples/assets/add-function-to-toolset.png
new file mode 100644
index 00000000..2c58bb29
Binary files /dev/null and b/docs/gram/examples/assets/add-function-to-toolset.png differ
diff --git a/docs/gram/examples/assets/configure-resend-api-key.png b/docs/gram/examples/assets/configure-resend-api-key.png
new file mode 100644
index 00000000..e42729b1
Binary files /dev/null and b/docs/gram/examples/assets/configure-resend-api-key.png differ
diff --git a/docs/gram/examples/assets/fill-env-vars-toolset.png b/docs/gram/examples/assets/fill-env-vars-toolset.png
new file mode 100644
index 00000000..09309dff
Binary files /dev/null and b/docs/gram/examples/assets/fill-env-vars-toolset.png differ
diff --git a/docs/gram/examples/assets/gram-new-project.png b/docs/gram/examples/assets/gram-new-project.png
new file mode 100644
index 00000000..d818897d
Binary files /dev/null and b/docs/gram/examples/assets/gram-new-project.png differ
diff --git a/docs/gram/examples/assets/mcp-details.png b/docs/gram/examples/assets/mcp-details.png
new file mode 100644
index 00000000..9f604cd1
Binary files /dev/null and b/docs/gram/examples/assets/mcp-details.png differ
diff --git a/docs/gram/examples/assets/set-env-vars.png b/docs/gram/examples/assets/set-env-vars.png
new file mode 100644
index 00000000..4595047b
Binary files /dev/null and b/docs/gram/examples/assets/set-env-vars.png differ
diff --git a/docs/gram/examples/assets/testing-the-send-email-function.png b/docs/gram/examples/assets/testing-the-send-email-function.png
new file mode 100644
index 00000000..0233adc4
Binary files /dev/null and b/docs/gram/examples/assets/testing-the-send-email-function.png differ
diff --git a/docs/gram/examples/assets/toolset-created.png b/docs/gram/examples/assets/toolset-created.png
new file mode 100644
index 00000000..710f63b0
Binary files /dev/null and b/docs/gram/examples/assets/toolset-created.png differ
diff --git a/docs/gram/examples/creating-taskmaster-mcp-server.mdx b/docs/gram/examples/creating-taskmaster-mcp-server.mdx
index 9706bb66..07a44cd3 100644
--- a/docs/gram/examples/creating-taskmaster-mcp-server.mdx
+++ b/docs/gram/examples/creating-taskmaster-mcp-server.mdx
@@ -18,7 +18,7 @@ You can try out Taskmaster [here](https://taskmaster-speakeasyapi.vercel.app/).
 Taskmaster is a full-stack CRUD application for tasks and projects. It includes:
 
 - A web UI for managing projects and tasks
-- A built-in HTTP API 
+- A built-in HTTP API
 - OAuth 2.0 authentication
 - A Neon PostgreSQL database for storing tasks and projects
 
@@ -35,11 +35,11 @@ To follow this tutorial, you need:
 
 ## Setting up a Gram project
 
-In the [Gram dashboard](https://app.getgram.ai), click **New Project** to start the guided setup flow for creating a toolset and MCP server.
+On the [Gram dashboard](https://app.getgram.ai), click your username in the bottom-left corner and then open the projects dropdown. Select **+ New Project**, enter a project name, and click **Submit**.
 
-![Screenshot of the Gram dashboard showing the New Project link](/assets/docs/gram/img/guides/build-mcp/create-taskmaster-mcp-server/gram-new-project.png)
+![Screenshot of the Gram dashboard showing the New Project link](./assets/gram-new-project.png)
 
-Enter a project name and click **Submit**. 
+Click **Get Started** and select **Start from API** to start the guided setup flow for creating a toolset and MCP server.
 
 Gram will then guide you through the following steps:
 
@@ -51,7 +51,7 @@ Upload the [Taskmaster OpenAPI document](https://github.com/speakeasy-api/taskma
 
 ### 2. Create a toolset
 
-Give your toolset a name (for example, `Taskmaster`) and click **Continue**. 
+Give your toolset a name (for example, `Taskmaster`) and click **Continue**.
 
 ![Screenshot of the create toolset dialog](/assets/docs/gram/img/guides/build-mcp/create-taskmaster-mcp-server/create-toolset.png)
 
@@ -67,7 +67,7 @@ Gram then creates the toolset from the OpenAPI document.
 
 Click **Toolsets** in the sidebar to view the **Taskmaster** toolset.
 
-![Screenshot of the Gram dashboard showing the Taskmaster toolset](/assets/docs/gram/img/guides/build-mcp/create-taskmaster-mcp-server/toolset-created.png)
+![Screenshot of the Gram dashboard showing the Taskmaster toolset](./assets/toolset-created.png)
 
 As you can see, the toolset needs environment variables before you can use it.
 
@@ -75,10 +75,10 @@ As you can see, the toolset needs environment variables before you can use it.
 
 Before configuring environment variables, create an API key:
 
-- Navigate to your Taskmaster app (for example, `https://taskmaster-ritza.vercel.app`).
+- Navigate to your Taskmaster app (for example, `https://taskmaster-speakeasyapi.vercel.app`).
 - Sign in and go to **Settings → Developer**.
-- Under **API Keys**, click **New Key**.
-- Give it a label and click **Create**.
+- Under **API Keys**, click **+ New**.
+- Give it a label and click **Generate Key**.
 - Copy the API key. You will not be able to see it again.
 
 <video width="600" muted={true} controls>
@@ -90,37 +90,36 @@ Before configuring environment variables, create an API key:
 
 [Environments](/docs/gram/concepts/environments) store API keys and configuration separately from your toolset logic.
 
-In the **Environments** tab, click the **Default** environment. Click the three-dot menu in the top-right corner of the environment card, and in the dropdown, click **Fill for Toolset**. Select the **Taskmaster** toolset and click **Fill Variables** to automatically populate the required variables.
+In the **Environments** tab, click the **Default** environment. Click **Fill for Toolset**. Select the **Taskmaster** toolset and click **Fill Variables** to automatically populate the required variables.
 
-![Screenshot showing the fill for toolset dialog to automatically populate required variables](/assets/docs/gram/img/guides/build-mcp/create-taskmaster-mcp-server/fill-env-vars-toolset.png)
+![Screenshot showing the fill for toolset dialog to automatically populate required variables](./assets/fill-env-vars-toolset.png)
 
 Configure the following environment variables:
 
-- Set the `TASKMASTER_SERVER_URL` environment variable to your API base URL. For example: `https://taskmaster-ritza.vercel.app/api`
-- Set the `TASKMASTER_ACCESS_TOKEN` environment variable to your API key. For example: `tm_abc123_def456`
-    Alternatively, you can set an `X-API-Key` header to the same value. The API accepts both.
+- Set the `TASKMASTER_SERVER_URL` environment variable to your API base URL. For example: `https://taskmaster-speakeasyapi.vercel.app/api`
+- Set the `TASKMASTER_API_KEY` environment variable to your API key. For example: `tm_abc123_def456`
 
-Click **Update** and then **Save**.
+Click **Save**.
 
-![Set server URL](/assets/docs/gram/img/guides/build-mcp/create-taskmaster-mcp-server/set-env-vars.png)
+![Set server URL](./assets/set-env-vars.png)
 
 ## Publishing an MCP server
 
 Let's make the toolset available as an MCP server.
 
-Go to the **MCP** tab, find the **Taskmaster** toolset, and click on it to open the MCP details page. 
+Go to the **MCP** tab, find the **Taskmaster** toolset, and click on it to open the **MCP Details** page.
 
-Scroll down to the **Visibility** section and tick the **Public** checkbox.
+To enable the server, click **Enable**, and then in the modal that opens, click **Enable Server**.
 
-![Screenshot of the MCP details page](/assets/docs/gram/img/guides/build-mcp/create-taskmaster-mcp-server/mcp-details.png)
+Scroll down to the **Visibility** section and select the **Public** checkbox.
 
-Next, you'll need to copy the MCP server configuration.
+![Screenshot of the MCP details page](./assets/mcp-details.png)
 
-Scroll down to the **MCP Config** section and copy the **Public Server** configuration.
+Next, you'll need to copy the MCP server configuration.
 
-![Screenshot showing the MCP server config dialog for the Taskmaster toolset](/assets/docs/gram/img/guides/build-mcp/create-taskmaster-mcp-server/copy-mcp-config.png)
+Scroll down to the **MCP Installation** section and click the **View** button to open the configuration details page.
 
-The configuration looks something like this:
+If you set the visibility to **Public**, the configuration will look something like this:
 
 ```json
 {
@@ -131,20 +130,22 @@ The configuration looks something like this:
           "mcp-remote",
           "https://app.getgram.ai/mcp/ritza-rzx-taskmaster",
           "--header",
-          "MCP-TASKMASTER-APIKEY-API-KEY:${VALUE}",
+          "MCP-TASKMASTER-API-KEY:${MCP_TASKMASTER_API_KEY}",
           "--header",
-          "MCP-TASKMASTER-APIKEY-SERVER-URL:${VALUE}"
-        ]
+          "MCP-TASKMASTER-OAUTH-TOKEN-ACCESS-TOKEN:${MCP_TASKMASTER_OAUTH_TOKEN_ACCESS_TOKEN}"
+        ],
+        "env": {
+          "MCP_TASKMASTER_OAUTH_TOKEN_ACCESS_TOKEN": "<your-value-here>",
+          "MCP_TASKMASTER_API_KEY": "<your-value-here>"
+        }
     }
   }
 }
 ```
 
-Use the **Authenticated Server** configuration if you want to use the MCP server in a private environment.
-
-You need an API key to use an authenticated server. Generate an API key in the Taskmaster **Settings → Developer → API Keys** page, copy it, and paste it in the `GRAM_KEY` environment variable in place of `<your-key-here>`.
+If you set the visibility to private, you will need a Gram API key to connect to the server. You can generate an API key under **Settings → New API Key** in the Gram dashboard, copy it, and paste it in the `GRAM_KEY` environment variable in place of `<your-key-here>`.
 
-The authenticated server configuration looks something like this:
+The configuration using the Gram key looks something like this:
 
 ```json
 {
@@ -155,11 +156,12 @@ The authenticated server configuration looks something like this:
         "mcp-remote",
         "https://app.getgram.ai/mcp/ritza-rzx-taskmaster",
         "--header",
-        "Gram-Environment:undefined",
+        "Gram-Environment:${GRAM_ENVIRONMENT}",
         "--header",
         "Authorization:${GRAM_KEY}"
       ],
       "env": {
+        "GRAM_ENVIRONMENT": "<your-value-here>",
         "GRAM_KEY": "Bearer <your-key-here>"
       }
     }
@@ -167,6 +169,101 @@ The authenticated server configuration looks something like this:
 }
 ```
 
+## Extending your MCP server with Gram Functions
+
+While the tools generated from your OpenAPI document handle basic CRUD operations, you can extend your MCP server with custom logic using [Gram Functions](/docs/gram/concepts/functions). This is useful for adding business logic that goes beyond simple API calls.
+
+For example, let's add a function that sends email reminders to users about their pending tasks. We'll use [Resend](https://resend.com) for sending emails. You can sign up for a free account and get an API key from their dashboard.
+
+### Creating a task reminder function
+
+1. Create a new Gram function project:
+
+    ```bash
+    pnpm create @gram-ai/function@latest --template gram
+    ```
+
+    This will prompt you to enter the directory name and the project name, which will be the name of the Gram function.
+
+2. Install the `resend` package with `pnpm install resend` and replace the contents of `src/gram.ts` with the following code:
+
+    ```ts
+    import { Gram } from "@gram-ai/functions";
+    import * as z from "zod/mini";
+    import { Resend } from "resend";
+    
+    const gram = new Gram({
+      envSchema: {
+        RESEND_API_KEY: z.string(),
+      },
+    }).tool({
+      name: "send_email",
+      description: "Send an email using Resend",
+      inputSchema: {
+        email: z.string(),
+        subject: z.string(),
+        text: z.string(),
+      },
+      async execute(ctx, input) {
+        const resend = new Resend(ctx.env["RESEND_API_KEY"]);
+    
+        try {
+          const result = await resend.emails.send({
+            from: "Acme <onboarding@resend.dev>",
+            to: [input["email"]],
+            subject: input["subject"],
+            html: `<p>${input["text"]}</p>`,
+          });
+    
+          return ctx.json({
+            success: true,
+            id: result.data?.id,
+            message: "Email sent successfully",
+          });
+        } catch (error) {
+          return ctx.fail(
+            {
+              error: "Failed to send email",
+              details: error instanceof Error ? error.message : String(error),
+            },
+            { status: 500 }
+          );
+        }
+      },
+    });
+    
+    export default gram;
+    ```
+
+    The code above creates a function called `send_email` that accepts an email address, task title, and description as validated inputs using Zod schemas. The function uses the Resend API to send formatted HTML emails, with comprehensive error handling using `ctx.fail()` to return structured error responses with appropriate HTTP status codes, and `ctx.json()` to return successful results with the email message ID.
+
+3. Build and deploy the function:
+
+    ```bash
+    pnpm build
+    pnpm push
+    ```
+
+4. In the Gram dashboard, go to **Toolsets**, click on the **Taskmaster** toolset, click **+ Add Tools**, select the newly created function, and save the changes.
+
+    ![Screenshot showing the Add Tool dialog with the send_email function selected](./assets/add-function-to-toolset.png)
+
+5. Update the environment variables by going to the **Auth** tab, updating the newly added `RESEND_API_KEY` variable with your Resend API key, and saving the environment.
+
+    ![Screenshot showing the environment configuration dialog with RESEND_API_KEY variable being added](./assets/configure-resend-api-key.png)
+
+Now the MCP server includes both the auto-generated CRUD tools from your OpenAPI document and a custom function for sending task reminders.
+
+You can test the tool in the Playground with the following prompt:
+
+```
+Please send an email to user@example.com to remind them of the pending tasks.
+```
+
+![Testing the send email tool](./assets/testing-the-send-email-function.png)
+
+You can find the complete code for this Resend integration example in the [Gram repository](https://github.com/speakeasy-api/gram/tree/main/examples/resend).
+
 ## Testing the MCP server
 
 Before connecting to external clients, test your setup by using the **Gram Playground** to verify that your tools are working correctly.
@@ -181,7 +278,7 @@ Before connecting to external clients, test your setup by using the **Gram Playg
 Your Taskmaster MCP server is now ready to use with any MCP client. You can connect it to:
 
 - [Claude Code](/docs/gram/clients/using-claude-code-with-gram-mcp-servers)
-- [Claude Desktop](/docs/gram/clients/using-claude-desktop-with-gram-mcp-server)  
+- [Claude Desktop](/docs/gram/clients/using-claude-desktop-with-gram-mcp-server)
 - [Your IDE](/docs/gram/clients/using-your-ide-with-gram-mcp-server)
 - [Cline](/docs/gram/clients/using-cline-with-gram-mcp-server)
 - Any other MCP-compatible client