diff --git a/src/app/[lang]/pricing/Card.module.css b/src/app/[lang]/pricing/Card.module.css
index 5c5d819..01bb756 100644
--- a/src/app/[lang]/pricing/Card.module.css
+++ b/src/app/[lang]/pricing/Card.module.css
@@ -2,10 +2,6 @@
 	padding-top: 24px !important;
 }
 
-.icon {
-	margin-right: 16px;
-}
-
 .mo {
 	font-size: 1.25rem;
 }
diff --git a/src/app/[lang]/pricing/Card.tsx b/src/app/[lang]/pricing/Card.tsx
index f5be8c6..4ef5d54 100644
--- a/src/app/[lang]/pricing/Card.tsx
+++ b/src/app/[lang]/pricing/Card.tsx
@@ -1,5 +1,4 @@
 import { Card as GCard, Divider, Spacer, Text } from "@geist-ui/react";
-import Check from "@geist-ui/react-icons/check";
 import React from "react";
 
 import styles from "./Card.module.css";
@@ -7,10 +6,8 @@ import { Dictionary } from "@/dictionaries";
 
 export interface CardProps extends React.HTMLProps<HTMLDivElement> {
 	d: Dictionary;
-	body?: React.ReactElement;
 	cta?: React.ReactElement;
-	extra?: React.ReactElement;
-	features?: (string | React.ReactElement)[];
+	features?: React.ReactElement[];
 	header?: string | React.ReactElement;
 	price?: string | React.ReactElement;
 	subtitle?: React.ReactElement;
@@ -19,17 +16,7 @@ export interface CardProps extends React.HTMLProps<HTMLDivElement> {
 }
 
 export function Card(props: CardProps): React.ReactElement {
-	const {
-		cta,
-		header,
-		features,
-		extra,
-		price,
-		title,
-		subtitle,
-		body,
-		footer,
-	} = props;
+	const { cta, header, features, price, title, subtitle, footer } = props;
 	const d = props.d.pricing;
 
 	return (
@@ -59,29 +46,8 @@ export function Card(props: CardProps): React.ReactElement {
 			<Divider />
 			<Spacer />
 
-			{extra}
+			{features}
 
-			<div>
-				<Text b small>
-					{d.cards.what_you_get}
-				</Text>
-				<Spacer />
-				{features?.map((f, i) => (
-					<div key={i}>
-						<div className="flex align-center">
-							<div>
-								<Check className={styles.icon} width={24} />
-							</div>
-							<Text small>{f}</Text>
-						</div>
-						<Spacer h={0.5} />
-					</div>
-				))}
-			</div>
-
-			{body}
-
-			{footer && <Divider />}
 			{footer && <div>{footer}</div>}
 		</GCard>
 	);
diff --git a/src/app/[lang]/pricing/Commercial.tsx b/src/app/[lang]/pricing/Commercial.tsx
index ba8ecb2..d0b1ea0 100644
--- a/src/app/[lang]/pricing/Commercial.tsx
+++ b/src/app/[lang]/pricing/Commercial.tsx
@@ -1,10 +1,9 @@
 import React from "react";
-import { Check, Info } from "@geist-ui/react-icons";
 import { ProductCard, ProductCardProps } from "./ProductCard";
-import { Spacer, Text } from "@geist-ui/react";
-import styles from "./Card.module.css";
+import { Text } from "@geist-ui/react";
 import Markdown from "marked-react";
 import { SpanRenderer } from "@/components/Markdown";
+import { Features } from "./Features";
 
 export function Commercial(
 	props: Omit<ProductCardProps, "title">
@@ -14,52 +13,30 @@ export function Commercial(
 	return (
 		<ProductCard
 			{...props}
-			extra={
-				<div>
-					<Text b small>
-						{d.what_need_to_do}
-					</Text>
-					<Spacer />
-					<div className="flex align-center">
-						<div>
-							<Check className={styles.icon} width={24} />
-						</div>
-						<Text small>
-							<Markdown renderer={SpanRenderer}>
-								{d.purchase_server}
-							</Markdown>
-						</Text>
-					</div>
-					<Spacer />
-				</div>
-			}
 			features={[
-				<Markdown renderer={SpanRenderer} key="licenseFeatures-3">
-					{d.unlimited_emails}
-				</Markdown>,
-				<Markdown renderer={SpanRenderer} key="licenseFeatures-1">
-					{d.bulk}
-				</Markdown>,
-				d.no_data_reacher,
-				<Markdown renderer={SpanRenderer} key="licenseFeatures-4">
-					{d.support}
-				</Markdown>,
-				<Markdown renderer={SpanRenderer} key="licenseFeatures-6">
-					{d.terms}
-				</Markdown>,
+				<Features
+					key="what-needs-to-do"
+					title={d.what_need_to_do}
+					features={[d.purchase_server]}
+				/>,
+				<Features
+					key="what-you-get"
+					title={d.what_you_get}
+					features={[
+						d.unlimited_emails,
+						d.bulk,
+						d.no_data_reacher,
+						d.support,
+						d.terms,
+					]}
+				/>,
+				<Features
+					key="commercial-license-trial"
+					title={d.free_trial}
+					features={[d["10k_per_day"], d.proxy, d.data_shared]}
+				/>,
 			]}
-			footer={
-				<div className="flex">
-					<div>
-						<Info className={styles.icon} width={24} />
-					</div>
-					<Text small>
-						<Markdown renderer={SpanRenderer}>
-							{d.free_trial}
-						</Markdown>
-					</Text>
-				</div>
-			}
+			ctaInFooter
 			header={
 				<Text b small type="success">
 					{d.overtitle}
diff --git a/src/app/[lang]/pricing/Features.module.css b/src/app/[lang]/pricing/Features.module.css
new file mode 100644
index 0000000..bf2709e
--- /dev/null
+++ b/src/app/[lang]/pricing/Features.module.css
@@ -0,0 +1,3 @@
+.icon {
+	margin-right: 16px;
+}
diff --git a/src/app/[lang]/pricing/Features.tsx b/src/app/[lang]/pricing/Features.tsx
new file mode 100644
index 0000000..285a17b
--- /dev/null
+++ b/src/app/[lang]/pricing/Features.tsx
@@ -0,0 +1,38 @@
+import { Spacer, Text } from "@geist-ui/react";
+import React from "react";
+
+import styles from "./Features.module.css";
+import { Check } from "@geist-ui/react-icons";
+import Markdown from "marked-react";
+import { SpanRenderer } from "@/components/Markdown";
+
+export function Features({
+	features,
+	title,
+}: {
+	features: string[];
+	title: string;
+}) {
+	return (
+		<>
+			<Text b small>
+				{title}
+			</Text>
+			<Spacer />
+			{features?.map((f, i) => (
+				<div key={i}>
+					<div className="flex align-center">
+						<div className={styles.icon}>
+							<Check width={24} />
+						</div>
+						<Text small>
+							<Markdown renderer={SpanRenderer}>{f}</Markdown>
+						</Text>
+					</div>
+					<Spacer h={0.5} />
+				</div>
+			))}
+			<Spacer />
+		</>
+	);
+}
diff --git a/src/app/[lang]/pricing/ProductCard.tsx b/src/app/[lang]/pricing/ProductCard.tsx
index 7ac1652..829332c 100644
--- a/src/app/[lang]/pricing/ProductCard.tsx
+++ b/src/app/[lang]/pricing/ProductCard.tsx
@@ -13,6 +13,7 @@ import { DLink } from "@/components/DLink";
 
 export interface ProductCardProps {
 	d: Dictionary;
+	ctaInFooter?: boolean;
 	currency: string;
 	isLoggedIn: boolean;
 	product: ProductWithPrice;
@@ -20,7 +21,7 @@ export interface ProductCardProps {
 	extra?: React.ReactElement;
 	header?: React.ReactElement;
 	footer?: React.ReactElement;
-	features?: (string | React.ReactElement)[];
+	features?: React.ReactElement[];
 	subtitle?: React.ReactElement;
 	ctaLabel: string;
 }
@@ -31,6 +32,8 @@ export function ProductCard({
 	product,
 	subscription,
 	ctaLabel,
+	ctaInFooter,
+	footer,
 	...props
 }: ProductCardProps): React.ReactElement {
 	const [priceIdLoading, setPriceIdLoading] = useState<string | false>();
@@ -81,7 +84,7 @@ export function ProductCard({
 		minimumFractionDigits: 0,
 	}).format(price.unit_amount / 100);
 
-	const b = (
+	const ctaButton = (
 		<Button
 			className="full-width"
 			disabled={!!priceIdLoading || active}
@@ -114,10 +117,10 @@ export function ProductCard({
 		<Card
 			cta={
 				isLoggedIn ? (
-					b
+					ctaButton
 				) : (
 					<DLink d={props.d} href="/signup" className="full-width">
-						{b}
+						{ctaButton}
 					</DLink>
 				)
 			}
@@ -128,6 +131,7 @@ export function ProductCard({
 				product.name ||
 				"No Product"
 			} // The latter should never happen
+			footer={footer ? footer : ctaInFooter ? ctaButton : undefined}
 			{...props}
 		/>
 	);
diff --git a/src/app/[lang]/pricing/SaaS100k.tsx b/src/app/[lang]/pricing/SaaS100k.tsx
index 3c9c495..95183e1 100644
--- a/src/app/[lang]/pricing/SaaS100k.tsx
+++ b/src/app/[lang]/pricing/SaaS100k.tsx
@@ -2,9 +2,7 @@ import React from "react";
 import { Text } from "@geist-ui/react";
 import { ProductCard } from "./ProductCard";
 import type { ProductCardProps } from "./ProductCard";
-import Markdown from "marked-react";
-import { SpanRenderer } from "@/components/Markdown";
-import { ENABLE_BULK } from "@/util/helpers";
+import { Features } from "./Features";
 
 export function SaaS100k(
 	props: Omit<ProductCardProps, "title">
@@ -20,22 +18,18 @@ export function SaaS100k(
 				</Text>
 			}
 			features={[
-				ENABLE_BULK ? (
-					<Markdown renderer={SpanRenderer} key="licenseFeatures-1">
-						{d.bulk}
-					</Markdown>
-				) : (
-					""
-				),
-				d.reacher_ip,
-				<Markdown renderer={SpanRenderer} key="saasFeatures-2">
-					{d.full_feature}
-				</Markdown>,
-				<Markdown renderer={SpanRenderer} key="customer-support">
-					{d.support}
-				</Markdown>,
-				d.cancel,
-			].filter((x) => !!x)}
+				<Features
+					key="what-you-get"
+					title={d.what_you_get}
+					features={[
+						d.bulk,
+						d.reacher_ip,
+						d.full_feature,
+						d.support,
+						d.cancel,
+					]}
+				/>,
+			]}
 			subtitle={<span>{d.subtitle}</span>}
 		/>
 	);
diff --git a/src/app/[lang]/pricing/SaaS10k.tsx b/src/app/[lang]/pricing/SaaS10k.tsx
index 989e951..d1b56d6 100644
--- a/src/app/[lang]/pricing/SaaS10k.tsx
+++ b/src/app/[lang]/pricing/SaaS10k.tsx
@@ -2,8 +2,7 @@ import React from "react";
 import { Text } from "@geist-ui/react";
 import { ProductCard } from "./ProductCard";
 import type { ProductCardProps } from "./ProductCard";
-import Markdown from "marked-react";
-import { SpanRenderer } from "@/components/Markdown";
+import { Features } from "./Features";
 
 export function SaaS10k(
 	props: Omit<ProductCardProps, "title">
@@ -19,14 +18,16 @@ export function SaaS10k(
 				</Text>
 			}
 			features={[
-				d.reacher_ip,
-				<Markdown renderer={SpanRenderer} key="saasFeatures-2">
-					{d.full_feature}
-				</Markdown>,
-				<Markdown renderer={SpanRenderer} key="customer-support">
-					{d.support}
-				</Markdown>,
-				d.cancel,
+				<Features
+					key="what-you-get"
+					title={d.what_you_get}
+					features={[
+						d.reacher_ip,
+						d.full_feature,
+						d.support,
+						d.cancel,
+					]}
+				/>,
 			]}
 			subtitle={<span>{d.subtitle}</span>}
 		/>
diff --git a/src/dictionaries/en.json b/src/dictionaries/en.json
index 6babdef..e00e36d 100644
--- a/src/dictionaries/en.json
+++ b/src/dictionaries/en.json
@@ -171,7 +171,6 @@
 		"30d_money_back": "All plans include a 30-day money back guarantee.",
 		"cards": {
 			"price": "/mo",
-			"what_you_get": "What you get:",
 			"select_plan_cta": "Choose plan",
 			"redirecting_to_stripe": "Redirecting to Stripe...",
 			"redirecting_to_signup": "Redirecting to signup...",
@@ -182,31 +181,37 @@
 		},
 		"commercial": {
 			"overtitle": "🏠 Self-Hosted",
-			"subtitle": "**Unlimited email** verifications / mo",
+			"subtitle": "**Unlimited** email verifications / mo",
 			"what_need_to_do": "What you need to do:",
 			"purchase_server": "Purchase servers yourself to self-host Reacher. [Read how](https://docs.reacher.email/self-hosting/install).",
+			"what_you_get": "What you get:",
 			"unlimited_emails": "**Unlimited** email verifications.",
 			"bulk": "💪 **Bulk** email verifications. [Read more](https://docs.reacher.email/self-hosting/bulk).",
 			"no_data_reacher": "No data sent back to Reacher.",
 			"support": "**Customer support** by email/chat.",
 			"cancel": "Cancel anytime.",
 			"terms": "See [full terms and details](https://docs.reacher.email/self-hosting/licensing).",
-			"free_trial": "Want a free trial before committing? Get started with [our docs](https://docs.reacher.email/self-hosting/licensing#does-reacher-offer-a-free-trial), and subscribe once you're ready."
+			"free_trial": "Interested in a Free Trial?",
+			"10k_per_day": "Limited to 10,000 email verifications / day.",
+			"proxy": "Built-in **high-quality proxy** courtesy of [Proxy4Smtp](https://www.proxy4smtp.com).",
+			"data_shared": "Basic usage metrics shared with Reacher to prevent abuse."
 		},
 		"saas10k": {
 			"overtitle": "For individuals",
 			"subtitle": "10,000 email verifications / mo",
+			"what_you_get": "What you get:",
 			"reacher_ip": "Use Reacher's servers with high IP reputation.",
-			"full_feature": "email verifications.",
+			"full_feature": "Full-featured email verifications.",
 			"support": "**Customer support** by email/chat.",
 			"cancel": "Cancel anytime."
 		},
 		"saas100k": {
 			"overtitle": "✨ New ✨",
 			"subtitle": "100,000 email verifications / mo",
+			"what_you_get": "What you get:",
 			"reacher_ip": "Use Reacher's servers with high IP reputation.",
 			"bulk": "💪  **Bulk** email verification via CSV list upload.",
-			"full_feature": "email verifications.",
+			"full_feature": "Full-featured email verifications.",
 			"support": "**Customer support** by email/chat.",
 			"cancel": "Cancel anytime."
 		},
@@ -217,7 +222,7 @@
 			"refund_q": "What is your refund policy?",
 			"refund_a": "Sure. If you use Reacher and find that the verifications are slow or incorrect, I'll refund you the full amount if you email me [✉️ amaury@reacher.email](mailto:amaury@reacher.email) within 30 days of your subscription.",
 			"free_trial_q": "Do you offer a free trial?",
-			"free_trial_a": "If you are interested in the SaaS 10K or 100K plans, then no, Reacher does not offer any free trial. There is however a 30-day money back guarantee.\n\nIf you are interested in the Commercial License, you can follow the [self-host guide](https://docs.reacher.email/self-hosting/install) for a free trial.",
+			"free_trial_a": "If you are interested in the SaaS 10K or 100K plans, then no, Reacher does not offer any free trial. There is however a 30-day money back guarantee.\n\nIf you are interested in the Commercial License, then simply sign-up and you'll get a [Commercial License Trial](https://docs.reacher.email/self-hosting/licensing/commercial-license-trial).",
 			"another_q": "Have another question?",
 			"another_a": "Feel free to email me [✉️ amaury@reacher.email](mailto:amaury@reacher.email), I reply pretty fast."
 		}
diff --git a/src/dictionaries/fr.json b/src/dictionaries/fr.json
index 284abab..cbfc8fd 100644
--- a/src/dictionaries/fr.json
+++ b/src/dictionaries/fr.json
@@ -171,7 +171,6 @@
 		"30d_money_back": "Tous les plans incluent une garantie de remboursement sous 30 jours.",
 		"cards": {
 			"price": "/mo HT",
-			"what_you_get": "Ce que vous obtenez :",
 			"select_plan_cta": "Choisir ce plan",
 			"redirecting_to_stripe": "Redirection vers Stripe...",
 			"redirecting_to_signup": "Redirection...",
@@ -184,18 +183,23 @@
 			"overtitle": "🏠 Auto-hébergé",
 			"subtitle": "Vérifications **illimitées** d'emails",
 			"what_need_to_do": "Ce que vous devez faire :",
-			"purchase_server": "Acheter vous-même des serveurs pour auto-héberger Reacher. [Lisez comment](https://docs.reacher.email/self-hosting/install).",
+			"purchase_server": "Achetez vous-même des serveurs pour auto-héberger Reacher. [Lisez comment](https://docs.reacher.email/self-hosting/install).",
+			"what_you_get": "Ce que vous obtenez :",
 			"unlimited_emails": "Vérifications d'emails **illimitées**.",
 			"bulk": "💪 Vérifications d'emails **en Bulk**. [En savoir plus](https://docs.reacher.email/self-hosting/bulk).",
 			"no_data_reacher": "Aucune donnée renvoyée à Reacher.",
 			"support": "**Support client** par email/chat.",
 			"cancel": "Annulez à tout moment.",
 			"terms": "Voir [les conditions et détails complets](https://docs.reacher.email/self-hosting/licensing).",
-			"free_trial": "Vous voulez un essai gratuit avant de vous engager ? Essayez Reacher avec [notre guide](https://docs.reacher.email/self-hosting/licensing#does-reacher-offer-a-free-trial), et abonnez-vous une fois que vous êtes prêt."
+			"free_trial": "Intéressé par un essai gratuit ?",
+			"10k_per_day": "Limité à 10 000 vérifications d'emails / jour.",
+			"proxy": "Proxy intégré de **haute qualité** fourni par [Proxy4Smtp](https://www.proxy4smtp.com).",
+			"data_shared": "Métriques d'utilisation basiques partagées avec Reacher pour prévenir les abus."
 		},
 		"saas10k": {
 			"overtitle": "Pour les particuliers",
 			"subtitle": "10 000 vérifications d'emails / mois",
+			"what_you_get": "Ce que vous obtenez :",
 			"reacher_ip": "Utilisez les serveurs de Reacher avec une haute réputation IP.",
 			"full_feature": "Vérifications d'emails [complètes](https://docs.reacher.email/getting-started/is-reachable).",
 			"support": "**Support client** par email/chat.",
@@ -204,6 +208,7 @@
 		"saas100k": {
 			"overtitle": "✨ Nouveau ✨",
 			"subtitle": "100 000 vérifications d'emails / mois",
+			"what_you_get": "Ce que vous obtenez :",
 			"reacher_ip": "Utilisez les serveurs de Reacher avec une haute réputation IP.",
 			"bulk": "💪 **Verifications d'emails en Bulk** avec upload de fichier CSV.",
 			"full_feature": "Vérifications d'emails [complètes](https://docs.reacher.email/getting-started/is-reachable).",
@@ -217,7 +222,7 @@
 			"refund_q": "Quelle est votre politique de remboursement ?",
 			"refund_a": "Bien sûr. Si vous utilisez Reacher et constatez que les vérifications sont lentes ou incorrectes, je vous rembourserai le montant total si vous m'envoyez un email [✉️ amaury@reacher.email](mailto:amaury@reacher.email) dans les 30 jours suivant votre abonnement.",
 			"free_trial_q": "Offrez-vous un essai gratuit ?",
-			"free_trial_a": "Si vous êtes intéressé par les plans SaaS 10K ou 100K, alors non, Reacher n'offre aucun essai gratuit. Il existe cependant une garantie de remboursement sous 30 jours.\n\nSi vous êtes intéressé par la Licence Commerciale, vous pouvez suivre le [guide d'auto-hébergement](https://docs.reacher.email/self-hosting/install) pour un essai gratuit.",
+			"free_trial_a": "Si vous êtes intéressé par les plans SaaS 10K ou 100K, alors non, Reacher n'offre pas d'essai gratuit. Cependant, il y a une garantie de remboursement de 30 jours.\n\nSi vous êtes intéressé par la Licence Commerciale, inscrivez-vous simplement et vous obtiendrez un [Essai de Licence Commerciale](https://docs.reacher.email/self-hosting/licensing/commercial-license-trial).",
 			"another_q": "Vous avez une autre question ?",
 			"another_a": "N'hésitez pas à m'envoyer un email [✉️ amaury@reacher.email](mailto:amaury@reacher.email), je réponds assez rapidement."
 		}