diff --git a/pages/docs/data-structure/group-analytics.mdx b/pages/docs/data-structure/group-analytics.mdx
index 8cacb8ea0c..aed79eb970 100644
--- a/pages/docs/data-structure/group-analytics.mdx
+++ b/pages/docs/data-structure/group-analytics.mdx
@@ -73,19 +73,22 @@ To access a group profile:
### Change the Group Identifier in a Report
-To change the identifier in a report:
+By default, Metrics aggregates at the user-level. To change the identifier used for for aggregation in a metric:
-1. Go to a report.
+1. Go to a report
+2. Click the “Users” dropdown within the Metric
+3. Select a Group. The report will now display results grouped by the newly selected group identifier.
-2. Click the **Analyze Uniques by** dropdown above the query builder.
+When your [Insights report](/docs/reports/insights) includes multiple Metrics, you can individually toggle the identifier for each one.
+
+For example, you can create an Insights report that shows Signups by unique Users and by unique Companies.
-
+
-3. Select the group identifier.
+Similarly, you can build a report that displays Conversion Rates per User and per Company.
-
+
-4. The report will now display results grouped by the newly selected group identifier.
### B2B Company Analytics
diff --git a/pages/docs/features.mdx b/pages/docs/features.mdx
index 219642221b..0487fe480e 100644
--- a/pages/docs/features.mdx
+++ b/pages/docs/features.mdx
@@ -9,7 +9,7 @@ import { Cards } from 'nextra/components'
-
+
diff --git a/pages/docs/features/_meta.ts b/pages/docs/features/_meta.ts
index 77441e3d65..5866618cb9 100644
--- a/pages/docs/features/_meta.ts
+++ b/pages/docs/features/_meta.ts
@@ -5,7 +5,8 @@ export default {
"chart-customization": "Chart Customization",
"custom-events": "Custom Events",
"custom-properties": "Custom Properties",
- "saved-behaviors": "Saved Behaviors",
+ "mcp": "MCP Integration",
+ "saved-metrics-and-behaviors": "Saved Metrics & Behaviors",
"sessions": "Sessions",
"spark": "Spark",
"advanced": "Advanced"
diff --git a/pages/docs/features/saved-behaviors.mdx b/pages/docs/features/saved-behaviors.mdx
deleted file mode 100644
index f6113f4b0d..0000000000
--- a/pages/docs/features/saved-behaviors.mdx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { Callout } from 'nextra/components'
-
-# Saved Behaviors: Reuse Funnels or Retention behavior definition in other reports
-
-
- Users on an Enterprise or Growth plan can use Saved Behaviors. See our [pricing page](https://mixpanel.com/pricing/) for more details.
-
-
-## Overview
-
-A saved behavior is a custom funnel or retention behavior definition that you can save and reuse. When saving a behavior you specify all of the steps as well as any filter that pertain to any of the steps, as well as the conversion criteria. As a reminder of [data hierarchy](/docs/reports#behaviors), a saved behavior is not a metric and does not include the measurement.
-
-You can use a saved behavior to centralize on key user flows in your product, and to standardize everyone on using the same definitions. For example, you have a 5 step sign up funnel. You can use a saved funnel behavior such that one team is working on the conversion rate between step 2 to 3, another team is focusing on steps 3 to 4, and yet another team can be working on reducing the time to convert on the same funnel. Then, if there is a change to the funnel behavior definition, all teams are still using the same funnel.
-
-## Create a Saved Behavior
-
-Once you are happy with the definition of a funnel or retention behavior, you can select the "Save as New" button at the bottom of the behavior. This will prompt you change the name if you'd like, add a description, and optionally choose to share the definition, so other members in your organization can also use it.
-
-
-
-## Editing a Saved Behavior
-
-When editing a saved behavior, you'll have the option to save the existing changes. There are 3 options that exist.
-
-
-
-- **Save for Everyone**: This will update the definition of the behavior for yourself, as well as in any report that is using the saved behavior. In this way, all usages of the behavior can stay in sync and there won't be mismatches across reports.
-- **Save as New**: In case a new behavior needs to be saved, you can select this option to save an entirely separate behavior.
-- **Reset**: Updates the behavior and reverts it back to the previously saved state. This is useful in exploratory cases where you don't want to save the definition.
-
-## Loading a Saved Behavior
-
-In Insights report, you can press "+ Metrics" and select "Funnels" or "Retention", where you'll be prompted initially to load an existing behavior. Here you can select a behavior to load or press "Create" to start building a new behavior.
-
-You can press the name of a behavior to open the menu to load an existing behavior. This can be done from Insights, Funnels or Retention.
-
-
-
-## See all Saved Behaviors
-
-To view, all saved behaviors, navigate to [Lexicon](/docs/data-governance/lexicon).
-You can edit and delete saved behaviors from Lexicon.
-
-
-
-In Lexicon, click on the **Behaviors** tab.
-Here you can see a list of all the saved behaviors in the project.
-
-Click on the **name** of the behavior to edit its details.
-
-
-
-Here you can also modify details of the behavior, including sharing, as well as see the behavior in a report.
-
-
-
-## Delete a Saved Behavior
-
-To delete a saved behavior, check the **box** beside the title of all the saved behaviors you want to delete in Lexicon, then click the **delete** button at the top of the list.
diff --git a/pages/docs/features/saved-metrics-and-behaviors.mdx b/pages/docs/features/saved-metrics-and-behaviors.mdx
new file mode 100644
index 0000000000..cda419dda7
--- /dev/null
+++ b/pages/docs/features/saved-metrics-and-behaviors.mdx
@@ -0,0 +1,133 @@
+import { Callout } from 'nextra/components'
+
+# Saved Metrics and Behaviors
+
+## Overview
+
+Saved Metrics and Behaviors allow you to define and standardize key measurements and user actions across your product/business. By saving these definitions, you ensure consistency, reusability, and accuracy across your reporting and analysis.
+
+
+
+## Saved Metrics
+
+**Saved Metrics** are standardized definitions for your organization's KPIs. They quantify the performance, progress, or success of various aspects of your product/business. Each saved metric is a measurement of an event, behavior, user cohort, or profile.
+
+**Example:** Create a saved metric for your Signup Conversion Rate to consistently track how effectively users complete your signup process.
+
+## Saved Behaviors
+
+**Saved Behaviors** are reusable definitions of specific user actions that represent a meaningful user journey or experience.
+
+**Example:** If your signup process involves multiple steps, you can define this entire sequence as a "Signup Funnel" saved behavior.
+
+Behaviors fall into one of three types: **Simple**, **Funnel**, or **Retention**.
+
+### Simple Behaviors
+
+**Simple Behaviors** are an "or" list of one or more events. These are useful when you have multiple events that need to be looked at together to measure a specific behavior. For example, below is a simple behavior for all product page interactions:
+
+
+
+**Simple Behaviors versus Custom Events**
+
+Simple Behaviors and [Custom Events](/docs/features/custom-events) are similar in that both allow you to combine multiple events for analysis. As a best practice, follow the guidelines below to determine whether to use Simple Behaviors or Custom Events:
+
+- Use **Simple Behaviors** if you want to create a definition that can be easily viewed and modified from the query builder in Insights reports
+- Use **Custom Events** if you need to need to create a virtual event that can be used everywhere in Mixpanel (e.g. inside a cohort definition or Funnel)
+
+
+### Funnel Behaviors
+
+
+ Learn more about the [Funnels report](/docs/reports/funnels).
+
+
+Funnel Behaviors define a sequence of events completed within a specified time frame. For example, we can save a behavior for the "Sign Up Funnel".
+
+
+
+### Retention Behaviors
+
+
+ Learn more about the [Retention report](/docs/reports/retention).
+
+
+Retention Behaviors look at when a user did an event, then came back to do the same or another event within a window of time. For example, we can save a behavior for our monthly returning purchasers.
+
+
+
+## Use Cases
+You can use Saved Metrics and Saved Behaviors independently or combine them. Below are example use cases for each:
+
+**Metrics**
+
+- **Save time:** Avoid redundant work. If you frequently recreate the same metric across multiple reports or boards, saving it as a metric streamlines your workflow.
+Onboarding & ease of use: Make it easy for anyone to understand what events and properties your organization uses to track your key metrics.
+
+- **Align your teams:** Establish trusted KPIs that all teams can rely on. This ensures everyone is working toward common goals using the same data.
+
+**Behaviors**
+
+- **Save time:** If you find yourself creating different metrics using the same set of events and filters, this is a good signal to create a saved behavior.
+
+- **Simplify updates:** Centralize definition management. If a specific user behavior or flow changes (e.g. your "Signup Flow" removes a step), you only need to update the saved behavior definition once. All saved metrics that rely on that behavior (e.g. "Signup Flow Time to Convert," "Signup Flow Conversion Rate," "Signup Flow Unique Users") will automatically reflect the updated Signup Flow definition.
+
+## Saving
+
+Click on the three dots menu next to the metric name. Select either **Save Metric** or **Saved Behavior**. You will be prompted to add a name and description.
+
+
+
+## Sharing
+
+By default, saved metrics and behaviors are private to you. After saving, you will be prompted to share.
+
+
+
+**Permissions**
+
+- Viewers: Can use this metric in analysis, but cannot modify the saved definition
+- Editors: Can use this metric in analysis, and modify the saved definition
+
+**Audiences**
+- Individuals: Set the permission for specific users in the project
+- Project: Sets the permission for all users in the project
+
+
+ The best practice is to give the project **View** access and add any **Editors** individually. This ensures that everyone can use the definitions that are managed by select people.
+
+
+## Using a Saved Metric or Behavior
+
+When you click “Select Metric” to populate your report, you will see all events as well as any saved definitions. You can search for a saved metric or behavior by name. Alternatively, you can browse the available saved metrics and behaviors using the tabs on the left.
+
+From an Insights report, you can select metrics and behaviors of all types. From Funnels and Retention reports, you will see only metrics and behaviors for that report type.
+
+!{}(/saved-metrics-and-behaviors4.png)
+
+## Updating Definitions
+Saved metrics or behaviors definitions may change over time. Mixpanel enables you to easily update these definitions and apply the changes across all reports that use them.
+
+After selecting a saved metric or behavior, you can modify the definition in the Query Builder. You will see a dotted line around the metric or behavior icon if the definition has been modified from the last saved state. Click the three-dot menu to make updates.
+
+
+
+- **Push Changes:** This applies your new definition to the original saved metric/behavior. All reports using this metric/behavior will be updated with the new definition.
+- **Save as New:** Creates a new metric with this new definition. The originally saved metric definition will not be affected.
+- **Clear Changes:** Reverts back to the previously saved state.
+
+## Managing Saved Metrics and Behaviors
+
+You can view all Saved Metrics and Behaviors in your project, add descriptions to clearly define them, and delete any unwanted definitions directly from the [Lexicon](/docs/data-governance/lexicon).
+
+From the Lexicon, click the "Metrics" tab to access all [Saved Metrics](/docs/features/saved-metrics-and-behaviors#saved-metrics) and [Formulas](/docs/reports/insights#formulas). Click the Behaviors tab to access all [Saved Behaviors](/docs/features/saved-metrics-and-behaviors#saved-behaviors).
+
+
+
+Click on the name of the definition you want to modify or delete. From the detail page, you will see all the options to customize the metric, including:
+- **Permissions:** Click "Share" to modify the metrics share settings.
+- **Verify:** [Add Verified badges](/docs/data-governance/lexicon#verify-data) to the metric/behavior. Only project Admins and Owners can verify entities in the Lexicon.
+- **Display Customizations:** Modify details about how this metric and its data appear by default.
+- **Delete:** Remove a saved metric from the project. Note, any reports using that saved metric will retain the definition, but be displayed in an unsaved state.
+
+
\ No newline at end of file
diff --git a/public/saved-metrics-and-behaviors1.png b/public/saved-metrics-and-behaviors1.png
new file mode 100644
index 0000000000..fe7d78d27a
Binary files /dev/null and b/public/saved-metrics-and-behaviors1.png differ
diff --git a/public/saved-metrics-and-behaviors10.png b/public/saved-metrics-and-behaviors10.png
new file mode 100644
index 0000000000..a9633db3fe
Binary files /dev/null and b/public/saved-metrics-and-behaviors10.png differ
diff --git a/public/saved-metrics-and-behaviors11.png b/public/saved-metrics-and-behaviors11.png
new file mode 100644
index 0000000000..2a63bbe889
Binary files /dev/null and b/public/saved-metrics-and-behaviors11.png differ
diff --git a/public/saved-metrics-and-behaviors12.png b/public/saved-metrics-and-behaviors12.png
new file mode 100644
index 0000000000..1a25d36978
Binary files /dev/null and b/public/saved-metrics-and-behaviors12.png differ
diff --git a/public/saved-metrics-and-behaviors2.png b/public/saved-metrics-and-behaviors2.png
new file mode 100644
index 0000000000..6f10eec07f
Binary files /dev/null and b/public/saved-metrics-and-behaviors2.png differ
diff --git a/public/saved-metrics-and-behaviors3.png b/public/saved-metrics-and-behaviors3.png
new file mode 100644
index 0000000000..a20d5fd9d3
Binary files /dev/null and b/public/saved-metrics-and-behaviors3.png differ
diff --git a/public/saved-metrics-and-behaviors4.png b/public/saved-metrics-and-behaviors4.png
new file mode 100644
index 0000000000..ae6a1b91b8
Binary files /dev/null and b/public/saved-metrics-and-behaviors4.png differ
diff --git a/public/saved-metrics-and-behaviors5.png b/public/saved-metrics-and-behaviors5.png
new file mode 100644
index 0000000000..801d2e2685
Binary files /dev/null and b/public/saved-metrics-and-behaviors5.png differ
diff --git a/public/saved-metrics-and-behaviors6.png b/public/saved-metrics-and-behaviors6.png
new file mode 100644
index 0000000000..763766e890
Binary files /dev/null and b/public/saved-metrics-and-behaviors6.png differ
diff --git a/public/saved-metrics-and-behaviors7.png b/public/saved-metrics-and-behaviors7.png
new file mode 100644
index 0000000000..7427171d18
Binary files /dev/null and b/public/saved-metrics-and-behaviors7.png differ
diff --git a/public/saved-metrics-and-behaviors8.png b/public/saved-metrics-and-behaviors8.png
new file mode 100644
index 0000000000..7d1892473a
Binary files /dev/null and b/public/saved-metrics-and-behaviors8.png differ
diff --git a/public/saved-metrics-and-behaviors9.png b/public/saved-metrics-and-behaviors9.png
new file mode 100644
index 0000000000..d99f538f1c
Binary files /dev/null and b/public/saved-metrics-and-behaviors9.png differ