diff --git a/src/components/Billing/UpdatePlanConfirmation.tsx b/src/components/Billing/UpdatePlanConfirmation.tsx
index 78cc041de..c14952f04 100644
--- a/src/components/Billing/UpdatePlanConfirmation.tsx
+++ b/src/components/Billing/UpdatePlanConfirmation.tsx
@@ -62,8 +62,8 @@ export function UpdatePlanConfirmation(props: UpdatePlanConfirmationProps) {
       <h3 className="text-xl font-bold text-black">Subscription Update</h3>
       <p className="mt-2 text-balance text-gray-600">
         Your plan will be updated to the{' '}
-        <b className="text-black">{planDetails.interval}</b> plan, and will
-        be charged{' '}
+        <b className="text-black">{planDetails.interval}</b> plan, and will be
+        charged{' '}
         <b className="text-black">
           ${selectedPrice.amount}/{selectedPrice.interval}
         </b>
@@ -72,21 +72,21 @@ export function UpdatePlanConfirmation(props: UpdatePlanConfirmationProps) {
 
       <div className="mt-6 grid grid-cols-2 gap-3">
         <button
-          className="rounded-md border border-gray-200 py-2 text-sm font-semibold hover:bg-gray-50 transition-colors disabled:opacity-50"
+          className="rounded-md border border-gray-200 py-2 text-sm font-semibold transition-colors hover:bg-gray-50 disabled:opacity-50"
           onClick={onCancel}
           disabled={isPending}
         >
           Cancel
         </button>
         <button
-          className="flex items-center justify-center rounded-md bg-purple-600 py-2 text-sm font-semibold text-white hover:bg-purple-500 transition-colors disabled:opacity-50"
+          className="flex items-center justify-center rounded-md bg-purple-600 py-2 text-sm font-semibold text-white transition-colors hover:bg-purple-500 disabled:opacity-50"
           disabled={isPending}
           onClick={() => {
             updatePlan({ priceId: selectedPrice.priceId });
           }}
         >
           {isPending && (
-            <Loader2Icon className="size-4 animate-spin stroke-[2.5] mr-2" />
+            <Loader2Icon className="mr-2 size-4 animate-spin stroke-[2.5]" />
           )}
           {!isPending && 'Confirm'}
         </button>
diff --git a/src/components/Billing/UpgradeAccountModal.tsx b/src/components/Billing/UpgradeAccountModal.tsx
index b187b7ab3..99cb73ed8 100644
--- a/src/components/Billing/UpgradeAccountModal.tsx
+++ b/src/components/Billing/UpgradeAccountModal.tsx
@@ -136,6 +136,14 @@ export function UpgradeAccountModal(props: UpgradeAccountModalProps) {
     setSelectedPlan(currentPlan.interval);
   }, [currentPlan]);
 
+  useEffect(() => {
+    window?.fireEvent({
+      action: 'tutor_pricing',
+      category: 'ai_tutor',
+      label: 'Clicked Upgrade to Pro',
+    });
+  }, []);
+
   if (!user) {
     return null;
   }
@@ -262,18 +270,35 @@ export function UpgradeAccountModal(props: UpgradeAccountModalProps) {
                         }
                         onClick={() => {
                           setSelectedPlan(plan.interval);
+
                           if (!currentPlanPriceId) {
                             const currentUrlPath = window.location.pathname;
-                            const encodedCurrentUrlPath = encodeURIComponent(
-                              currentUrlPath,
-                            );
+                            const encodedCurrentUrlPath =
+                              encodeURIComponent(currentUrlPath);
                             const successPage = `/thank-you?next=${encodedCurrentUrlPath}&s=1`;
 
-                            createCheckoutSession({
-                              priceId: plan.priceId,
-                              success: success || successPage,
-                              cancel: cancel || `${currentUrlPath}?s=0`,
+                            window?.fireEvent({
+                              action: 'tutor_checkout',
+                              category: 'ai_tutor',
+                              label: 'Checkout Started',
                             });
+
+                            createCheckoutSession(
+                              {
+                                priceId: plan.priceId,
+                                success: success || successPage,
+                                cancel: cancel || `${currentUrlPath}?s=0`,
+                              },
+                              {
+                                onSuccess: () => {
+                                  window?.fireEvent({
+                                    action: `tutor_checkout_${plan.interval === 'month' ? 'mo' : 'an'}`,
+                                    category: 'ai_tutor',
+                                    label: `${plan.interval} Plan Checkout Started`,
+                                  });
+                                },
+                              },
+                            );
                             return;
                           }
                           setIsUpdatingPlan(true);
diff --git a/src/components/Billing/VerifyUpgrade.tsx b/src/components/Billing/VerifyUpgrade.tsx
index f59105fd0..85b0142ab 100644
--- a/src/components/Billing/VerifyUpgrade.tsx
+++ b/src/components/Billing/VerifyUpgrade.tsx
@@ -30,11 +30,40 @@ export function VerifyUpgrade(props: VerifyUpgradeProps) {
       userBillingDetails.status === 'active' &&
       (newPriceId ? userBillingDetails.priceId === newPriceId : true)
     ) {
+      if (!newPriceId) {
+        // it means that the user is subscribing for the first time
+        // not changing the plan
+        window?.fireEvent({
+          action: `tutor_purchase_${userBillingDetails.interval === 'month' ? 'mo' : 'an'}`,
+          category: 'ai_tutor',
+          label: `${userBillingDetails.interval} Plan Purchased`,
+        });
+      }
+
       deleteUrlParam('s');
       window.location.reload();
     }
   }, [userBillingDetails]);
 
+  useEffect(() => {
+    // it means that the user is changing the plan
+    // not subscribing for the first time
+    if (newPriceId) {
+      return;
+    }
+
+    window?.fireEvent({
+      action: 'tutor_purchase',
+      category: 'ai_tutor',
+      label: 'Subscription Activated',
+    });
+    window?.fireEvent({
+      action: 'tutor_ty',
+      category: 'ai_tutor',
+      label: 'Thank You Page Visited',
+    });
+  }, [newPriceId]);
+
   return (
     <Modal
       // it's an unique modal, so we don't need to close it
@@ -47,11 +76,11 @@ export function VerifyUpgrade(props: VerifyUpgradeProps) {
         <h3 className="text-xl font-bold text-black">Subscription Activated</h3>
       </div>
 
-      <p className="mt-2 text-balance text-center text-gray-600">
+      <p className="mt-2 text-center text-balance text-gray-600">
         Your subscription has been activated successfully.
       </p>
 
-      <p className="mt-4 text-balance text-center text-gray-600">
+      <p className="mt-4 text-center text-balance text-gray-600">
         It might take a minute for the changes to reflect. We will{' '}
         <b className="text-black">reload</b> the page for you.
       </p>
diff --git a/src/components/GenerateCourse/AICourse.tsx b/src/components/GenerateCourse/AICourse.tsx
index ccbd23a65..e0c5fca47 100644
--- a/src/components/GenerateCourse/AICourse.tsx
+++ b/src/components/GenerateCourse/AICourse.tsx
@@ -51,6 +51,14 @@ export function AICourse(props: AICourseProps) {
     setCustomInstructions(fineTuneData.customInstructions);
   }, []);
 
+  useEffect(() => {
+    window?.fireEvent({
+      action: 'tutor_user',
+      category: 'ai_tutor',
+      label: 'Visited AI Course Page',
+    });
+  }, []);
+
   const handleKeyDown = (e: React.KeyboardEvent) => {
     if (e.key === 'Enter' && keyword.trim()) {
       onSubmit();