diff --git a/.maestro/shared/set_internal_user_from_settings.yaml b/.maestro/shared/set_internal_user_from_settings.yaml
index 40d8f80468..d7edd5b505 100644
--- a/.maestro/shared/set_internal_user_from_settings.yaml
+++ b/.maestro/shared/set_internal_user_from_settings.yaml
@@ -5,6 +5,8 @@ appId: com.duckduckgo.mobile.ios
     element: All debug options
 - assertVisible: All debug options
 - tapOn: All debug options
+- scrollUntilVisible:
+    element: Internal User State
 - tapOn: Internal User State
 - tapOn: Settings
 - tapOn: Done
diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
index 4e407b2295..8df681d0d9 100644
--- a/Configuration/Version.xcconfig
+++ b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 7.129.0
+MARKETING_VERSION = 7.130.0
diff --git a/Core/AppPrivacyConfigurationDataProvider.swift b/Core/AppPrivacyConfigurationDataProvider.swift
index e6d02a580e..59761cd78f 100644
--- a/Core/AppPrivacyConfigurationDataProvider.swift
+++ b/Core/AppPrivacyConfigurationDataProvider.swift
@@ -23,8 +23,8 @@ import BrowserServicesKit
 final public class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"d73997ee1028028a4259dec5f9c4beca\""
-        public static let embeddedDataSHA = "2810166895dee6bfebfc57d6dc041ef008bf85f9346e541c963d63d8fa1dc2dc"
+        public static let embeddedDataETag = "\"6731933419540cb11a6a0898b0c26bdb\""
+        public static let embeddedDataSHA = "88b018fcabee20e6a210d3c65f122c0019ca5bb900c9a0148945e4c4c609856d"
     }
 
     public var embeddedDataEtag: String {
diff --git a/Core/DefaultVariantManager.swift b/Core/DefaultVariantManager.swift
index 588afe4e17..c2f73b4dc8 100644
--- a/Core/DefaultVariantManager.swift
+++ b/Core/DefaultVariantManager.swift
@@ -50,7 +50,7 @@ public struct VariantIOS: Variant {
     }
 
     /// This variant is used for returning users to separate them from really new users.
-    static let returningUser = VariantIOS(name: "ru", weight: doNotAllocate, isIncluded: When.always, features: [])
+    public static let returningUser = VariantIOS(name: "ru", weight: doNotAllocate, isIncluded: When.always, features: [])
 
     static let doNotAllocate = 0
 
diff --git a/Core/ios-config.json b/Core/ios-config.json
index c5d0760424..4647d5626d 100644
--- a/Core/ios-config.json
+++ b/Core/ios-config.json
@@ -1,6 +1,6 @@
 {
     "readme": "https://github.com/duckduckgo/privacy-configuration",
-    "version": 1720796469387,
+    "version": 1721406809556,
     "features": {
         "adClickAttribution": {
             "readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection",
@@ -1523,6 +1523,10 @@
                         "selector": "#leaderboard",
                         "type": "closest-empty"
                     },
+                    {
+                        "selector": "#leaderboard-container",
+                        "type": "hide-empty"
+                    },
                     {
                         "selector": ".leaderboard_wrapper",
                         "type": "hide-empty"
@@ -1551,6 +1555,10 @@
                         "selector": "#topAd",
                         "type": "hide-empty"
                     },
+                    {
+                        "selector": "#topad",
+                        "type": "hide-empty"
+                    },
                     {
                         "selector": ".ad-banner-container",
                         "type": "hide-empty"
@@ -2850,6 +2858,27 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "gizmodo.com",
+                        "rules": [
+                            {
+                                "selector": ".banner-top",
+                                "type": "closest-empty"
+                            },
+                            {
+                                "selector": ".od-wrapper",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": ".widget_keleops-ad",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": "[id^='optidigital-adslot-Billboard']",
+                                "type": "closest-empty"
+                            }
+                        ]
+                    },
                     {
                         "domain": "google.com",
                         "rules": [
@@ -4581,7 +4610,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "c69c499b65697c42f660e3c5588bebe4"
+            "hash": "507d3d1aba39974635faf482e944f310"
         },
         "exceptionHandler": {
             "exceptions": [
@@ -5227,6 +5256,21 @@
             ],
             "hash": "1a1a4652687f25da9f351df157c5e051"
         },
+        "phishingDetection": {
+            "state": "disabled",
+            "exceptions": [
+                {
+                    "domain": "marvel.com"
+                },
+                {
+                    "domain": "sundancecatalog.com"
+                },
+                {
+                    "domain": "noaprints.com"
+                }
+            ],
+            "hash": "7b395d1b9b54fd08f5a949b920d28552"
+        },
         "pluginPointFocusedViewPlugin": {
             "state": "disabled",
             "exceptions": [],
@@ -8808,6 +8852,9 @@
         },
         "webCompat": {
             "exceptions": [
+                {
+                    "domain": "crocs.com"
+                },
                 {
                     "domain": "marvel.com"
                 },
@@ -8861,7 +8908,7 @@
                     }
                 ]
             },
-            "hash": "25d935f0276cd0d81fc6f25811f7cb36"
+            "hash": "895bea376ffb485029872b8279778ce6"
         },
         "webViewBlobDownload": {
             "exceptions": [],
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index 9477213082..c3e12f62c5 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -88,6 +88,7 @@
 		1E908BF129827C480008C8F3 /* AutoconsentUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E908BEE29827C480008C8F3 /* AutoconsentUserScript.swift */; };
 		1E908BF229827C480008C8F3 /* autoconsent-bundle.js in Resources */ = {isa = PBXBuildFile; fileRef = 1E908BEF29827C480008C8F3 /* autoconsent-bundle.js */; };
 		1E908BF329827C480008C8F3 /* AutoconsentManagement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E908BF029827C480008C8F3 /* AutoconsentManagement.swift */; };
+		1E9529A12C4E748B006E80D4 /* UINavigationControllerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E9529A02C4E748B006E80D4 /* UINavigationControllerExtension.swift */; };
 		1EA51376286596A000493C6A /* PrivacyIconLogic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EA51375286596A000493C6A /* PrivacyIconLogic.swift */; };
 		1EA513782866039400493C6A /* TrackerAnimationLogic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EA513772866039400493C6A /* TrackerAnimationLogic.swift */; };
 		1EC458462948932500CB2B13 /* UIHostingControllerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EC458452948932500CB2B13 /* UIHostingControllerExtension.swift */; };
@@ -723,6 +724,8 @@
 		BD862E0B2B30F9300073E2EE /* VPNFeedbackFormView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD862E0A2B30F9300073E2EE /* VPNFeedbackFormView.swift */; };
 		BDC234F72B27F51100D3C798 /* UniquePixel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDC234F62B27F51100D3C798 /* UniquePixel.swift */; };
 		BDD3B3552B8EF8DB005857A8 /* NetworkProtectionUNNotificationPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE3766DD2AC5945500AAB575 /* NetworkProtectionUNNotificationPresenter.swift */; };
+		BDE219E62C406D19005D5884 /* PrivacyProDataReporting.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDE219E52C406D19005D5884 /* PrivacyProDataReporting.swift */; };
+		BDE219EA2C457B46005D5884 /* PrivacyProDataReporterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDE219E92C457B46005D5884 /* PrivacyProDataReporterTests.swift */; };
 		BDF8D0022C1B87F4003E3B27 /* NetworkProtectionDNSSettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDF8D0012C1B87F4003E3B27 /* NetworkProtectionDNSSettingsViewModel.swift */; };
 		BDFF031D2BA3D2BD00F324C9 /* DefaultNetworkProtectionVisibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDFF031C2BA3D2BD00F324C9 /* DefaultNetworkProtectionVisibility.swift */; };
 		BDFF03212BA3D3CF00F324C9 /* NetworkProtectionVisibilityForTunnelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDFF03202BA3D3CF00F324C9 /* NetworkProtectionVisibilityForTunnelProvider.swift */; };
@@ -1247,6 +1250,7 @@
 		1E908BEE29827C480008C8F3 /* AutoconsentUserScript.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutoconsentUserScript.swift; sourceTree = "<group>"; };
 		1E908BEF29827C480008C8F3 /* autoconsent-bundle.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "autoconsent-bundle.js"; sourceTree = "<group>"; };
 		1E908BF029827C480008C8F3 /* AutoconsentManagement.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutoconsentManagement.swift; sourceTree = "<group>"; };
+		1E9529A02C4E748B006E80D4 /* UINavigationControllerExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UINavigationControllerExtension.swift; sourceTree = "<group>"; };
 		1EA51375286596A000493C6A /* PrivacyIconLogic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacyIconLogic.swift; sourceTree = "<group>"; };
 		1EA513772866039400493C6A /* TrackerAnimationLogic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackerAnimationLogic.swift; sourceTree = "<group>"; };
 		1EC458452948932500CB2B13 /* UIHostingControllerExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIHostingControllerExtension.swift; sourceTree = "<group>"; };
@@ -2399,6 +2403,8 @@
 		BD862E082B30F63E0073E2EE /* VPNMetadataCollector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNMetadataCollector.swift; sourceTree = "<group>"; };
 		BD862E0A2B30F9300073E2EE /* VPNFeedbackFormView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNFeedbackFormView.swift; sourceTree = "<group>"; };
 		BDC234F62B27F51100D3C798 /* UniquePixel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UniquePixel.swift; sourceTree = "<group>"; };
+		BDE219E52C406D19005D5884 /* PrivacyProDataReporting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacyProDataReporting.swift; sourceTree = "<group>"; };
+		BDE219E92C457B46005D5884 /* PrivacyProDataReporterTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrivacyProDataReporterTests.swift; sourceTree = "<group>"; };
 		BDF8D0012C1B87F4003E3B27 /* NetworkProtectionDNSSettingsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionDNSSettingsViewModel.swift; sourceTree = "<group>"; };
 		BDFF03192BA39C5A00F324C9 /* NetworkProtectionFeatureVisibility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionFeatureVisibility.swift; sourceTree = "<group>"; };
 		BDFF031C2BA3D2BD00F324C9 /* DefaultNetworkProtectionVisibility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultNetworkProtectionVisibility.swift; sourceTree = "<group>"; };
@@ -4751,6 +4757,7 @@
 				D664C7B02B289AA000CBFA76 /* UserScripts */,
 				D664C7962B289AA000CBFA76 /* Extensions */,
 				D65CEA6F2B6AC6C9008A759B /* Subscription.xcassets */,
+				BDE219E52C406D19005D5884 /* PrivacyProDataReporting.swift */,
 			);
 			path = Subscription;
 			sourceTree = "<group>";
@@ -5499,6 +5506,7 @@
 		F1BDDBFC2C340D9C00459306 /* Subscription */ = {
 			isa = PBXGroup;
 			children = (
+				BDE219E92C457B46005D5884 /* PrivacyProDataReporterTests.swift */,
 				F1BDDBF92C340D9C00459306 /* SubscriptionContainerViewModelTests.swift */,
 				F1BDDBFA2C340D9C00459306 /* SubscriptionFlowViewModelTests.swift */,
 				F1BDDBFB2C340D9C00459306 /* SubscriptionPagesUseSubscriptionFeatureTests.swift */,
@@ -5678,6 +5686,7 @@
 				319A37162829C8AD0079FBCE /* UITableViewExtension.swift */,
 				854A01322A558B3A00FCC628 /* UIView+Constraints.swift */,
 				F143C32C1E4A9A4800CFDE3A /* UIViewControllerExtension.swift */,
+				1E9529A02C4E748B006E80D4 /* UINavigationControllerExtension.swift */,
 				F1DE78591E5CD2A70058895A /* UIViewExtension.swift */,
 				F1F5337B1F26A9EF00D80D4F /* UserText.swift */,
 				4BBBBA912B03291700D965DA /* VPNWaitlistUserText.swift */,
@@ -6855,6 +6864,7 @@
 				1E8AD1D127C000AB00ABA377 /* OngoingDownloadRow.swift in Sources */,
 				1DEAADF02BA46E0700E25A97 /* PrivateSearchView.swift in Sources */,
 				85058366219AE9EA00ED4EDB /* HomePageConfiguration.swift in Sources */,
+				1E9529A12C4E748B006E80D4 /* UINavigationControllerExtension.swift in Sources */,
 				EE0153E12A6EABE0002A8B26 /* NetworkProtectionConvenienceInitialisers.swift in Sources */,
 				C17B595B2A03AAD30055F2D1 /* PasswordGenerationPromptView.swift in Sources */,
 				98AA92B32456FBE100ED4B9E /* SearchFieldContainerView.swift in Sources */,
@@ -7053,6 +7063,7 @@
 				F1D796F01E7B07610019D451 /* BookmarksViewControllerCells.swift in Sources */,
 				9F9EE4D42C37BB1300D4118E /* OnboardingView+Landing.swift in Sources */,
 				85058369219F424500ED4EDB /* UIColorExtension.swift in Sources */,
+				BDE219E62C406D19005D5884 /* PrivacyProDataReporting.swift in Sources */,
 				D6E83C312B1EA309006C8AFB /* SettingsCell.swift in Sources */,
 				85058368219C49E000ED4EDB /* HomeViewSectionRenderers.swift in Sources */,
 				1DEAADEE2BA45DFE00E25A97 /* SettingsDataClearingView.swift in Sources */,
@@ -7217,6 +7228,7 @@
 				F1134EBC1F40D45700B73467 /* MockStatisticsStore.swift in Sources */,
 				983C52E72C2C0ACB007B5747 /* BookmarkStateRepairTests.swift in Sources */,
 				31C138AC27A403CB00FFD4B2 /* DownloadManagerTests.swift in Sources */,
+				BDE219EA2C457B46005D5884 /* PrivacyProDataReporterTests.swift in Sources */,
 				EEFE9C732A603CE9005B0A26 /* NetworkProtectionStatusViewModelTests.swift in Sources */,
 				F13B4BF91F18CA0600814661 /* TabsModelTests.swift in Sources */,
 				F1BDDBFD2C340D9C00459306 /* SubscriptionContainerViewModelTests.swift in Sources */,
@@ -8405,7 +8417,7 @@
 				CODE_SIGN_ENTITLEMENTS = PacketTunnelProvider/PacketTunnelProvider.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = HKE973VLUW;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -8442,7 +8454,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -8532,7 +8544,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -8559,7 +8571,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -8708,7 +8720,7 @@
 				CODE_SIGN_ENTITLEMENTS = DuckDuckGo/DuckDuckGo.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_ASSET_PATHS = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
@@ -8733,7 +8745,7 @@
 				CODE_SIGN_ENTITLEMENTS = DuckDuckGo/DuckDuckGo.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
 				INFOPLIST_FILE = DuckDuckGo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -8802,7 +8814,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				DEAD_CODE_STRIPPING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = Widgets/Info.plist;
@@ -8836,7 +8848,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
@@ -8869,7 +8881,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = OpenAction/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -8899,7 +8911,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -9209,7 +9221,7 @@
 				CODE_SIGN_ENTITLEMENTS = DuckDuckGo/DuckDuckGoAlpha.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_ASSET_PATHS = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
@@ -9240,7 +9252,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -9268,7 +9280,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = OpenAction/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -9301,7 +9313,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				DEAD_CODE_STRIPPING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = Widgets/Info.plist;
@@ -9331,7 +9343,7 @@
 				CODE_SIGN_ENTITLEMENTS = PacketTunnelProvider/PacketTunnelProviderAlpha.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = HKE973VLUW;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -9364,11 +9376,11 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 0;
+				DYLIB_CURRENT_VERSION = 2;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Core/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -9601,7 +9613,7 @@
 				CODE_SIGN_ENTITLEMENTS = DuckDuckGo/DuckDuckGoAlpha.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_ASSET_PATHS = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
@@ -9628,7 +9640,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -9660,7 +9672,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -9697,7 +9709,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
@@ -9732,7 +9744,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -9767,11 +9779,11 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 0;
+				DYLIB_CURRENT_VERSION = 2;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Core/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -9944,11 +9956,11 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 0;
+				DYLIB_CURRENT_VERSION = 2;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Core/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -9977,10 +9989,10 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 2;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 0;
+				DYLIB_CURRENT_VERSION = 2;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Core/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index dc777dbaea..0c0bf3bee7 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -138,7 +138,7 @@
     {
       "identity" : "swift-argument-parser",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-argument-parser.git",
+      "location" : "https://github.com/apple/swift-argument-parser",
       "state" : {
         "revision" : "0fbc8848e389af3bb55c182bc19ca9d5dc2f255b",
         "version" : "1.4.0"
diff --git a/DuckDuckGo/AppDelegate.swift b/DuckDuckGo/AppDelegate.swift
index 69dc0b2f90..e9d6bb424c 100644
--- a/DuckDuckGo/AppDelegate.swift
+++ b/DuckDuckGo/AppDelegate.swift
@@ -92,6 +92,8 @@ import WebKit
 
     private var autofillPixelReporter: AutofillPixelReporter?
 
+    var privacyProDataReporter: PrivacyProDataReporting!
+
     // MARK: lifecycle
 
     @UserDefaultsWrapper(key: .privacyConfigCustomURL, defaultValue: nil)
@@ -106,12 +108,6 @@ import WebKit
 
     override init() {
         super.init()
-
-        if !didCrashDuringCrashHandlersSetUp {
-            didCrashDuringCrashHandlersSetUp = true
-            CrashLogMessageExtractor.setUp()
-            didCrashDuringCrashHandlersSetUp = false
-        }
     }
 
     // swiftlint:disable:next function_body_length
@@ -278,6 +274,8 @@ import WebKit
         syncService.initializeIfNeeded()
         self.syncService = syncService
 
+        privacyProDataReporter = PrivacyProDataReporter()
+
         isSyncInProgressCancellable = syncService.isSyncInProgressPublisher
             .filter { $0 }
             .sink { [weak syncService] _ in
@@ -303,12 +301,15 @@ import WebKit
         remoteMessagingClient.registerBackgroundRefreshTaskHandler()
 
         homePageConfiguration = HomePageConfiguration(variantManager: AppDependencyProvider.shared.variantManager,
-                                                      remoteMessagingClient: remoteMessagingClient)
+                                                      remoteMessagingClient: remoteMessagingClient,
+                                                      privacyProDataReporter: privacyProDataReporter)
 
         let previewsSource = TabPreviewsSource()
         let historyManager = makeHistoryManager()
         let tabsModel = prepareTabsModel(previewsSource: previewsSource)
 
+        privacyProDataReporter.injectTabsModel(tabsModel)
+
         let main = MainViewController(bookmarksDatabase: bookmarksDatabase,
                                       bookmarksDatabaseCleaner: syncDataProviders.bookmarksAdapter.databaseCleaner,
                                       historyManager: historyManager,
@@ -318,7 +319,8 @@ import WebKit
                                       appSettings: AppDependencyProvider.shared.appSettings,
                                       previewsSource: previewsSource,
                                       tabsModel: tabsModel,
-                                      syncPausedStateManager: syncErrorHandler)
+                                      syncPausedStateManager: syncErrorHandler,
+                                      privacyProDataReporter: privacyProDataReporter)
 
         main.loadViewIfNeeded()
         syncErrorHandler.alertPresenter = main
@@ -516,6 +518,9 @@ import WebKit
         }
 
         syncService.scheduler.notifyAppLifecycleEvent()
+        
+        privacyProDataReporter.injectSyncService(syncService)
+
         fireFailedCompilationsPixelIfNeeded()
 
 #if NETWORK_PROTECTION
@@ -542,6 +547,10 @@ import WebKit
 
         let importPasswordsStatusHandler = ImportPasswordsStatusHandler(syncService: syncService)
         importPasswordsStatusHandler.checkSyncSuccessStatus()
+
+        Task {
+            await privacyProDataReporter.saveWidgetAdded()
+        }
     }
 
     private func stopAndRemoveVPNIfNotAuthenticated() async {
@@ -652,6 +661,7 @@ import WebKit
         AppDependencyProvider.shared.autofillLoginSession.endSession()
         suspendSync()
         syncDataProviders.bookmarksAdapter.cancelFaviconsFetching(application)
+        privacyProDataReporter.saveApplicationLastSessionEnded()
     }
 
     private func suspendSync() {
diff --git a/DuckDuckGo/DaxOnboarding.xcassets/DaxIcon.imageset/Contents.json b/DuckDuckGo/DaxOnboarding.xcassets/DaxIcon.imageset/Contents.json
index 70de8cfe2f..1ccb01ec41 100644
--- a/DuckDuckGo/DaxOnboarding.xcassets/DaxIcon.imageset/Contents.json
+++ b/DuckDuckGo/DaxOnboarding.xcassets/DaxIcon.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "DaxLogo.pdf",
+      "filename" : "new_dax_dialogs.pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/DuckDuckGo/DaxOnboarding.xcassets/DaxIcon.imageset/new_dax_dialogs.pdf b/DuckDuckGo/DaxOnboarding.xcassets/DaxIcon.imageset/new_dax_dialogs.pdf
new file mode 100644
index 0000000000..02d8801223
Binary files /dev/null and b/DuckDuckGo/DaxOnboarding.xcassets/DaxIcon.imageset/new_dax_dialogs.pdf differ
diff --git a/DuckDuckGo/DaxOnboarding.xcassets/DaxIconExperiment.imageset/Contents.json b/DuckDuckGo/DaxOnboarding.xcassets/DaxIconExperiment.imageset/Contents.json
new file mode 100644
index 0000000000..70de8cfe2f
--- /dev/null
+++ b/DuckDuckGo/DaxOnboarding.xcassets/DaxIconExperiment.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "DaxLogo.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/DaxOnboarding.xcassets/DaxIcon.imageset/DaxLogo.pdf b/DuckDuckGo/DaxOnboarding.xcassets/DaxIconExperiment.imageset/DaxLogo.pdf
similarity index 100%
rename from DuckDuckGo/DaxOnboarding.xcassets/DaxIcon.imageset/DaxLogo.pdf
rename to DuckDuckGo/DaxOnboarding.xcassets/DaxIconExperiment.imageset/DaxLogo.pdf
diff --git a/DuckDuckGo/Debug.storyboard b/DuckDuckGo/Debug.storyboard
index 46d581edff..9d6e3255c3 100644
--- a/DuckDuckGo/Debug.storyboard
+++ b/DuckDuckGo/Debug.storyboard
@@ -220,7 +220,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="383.5" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Subscriptions" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2HN-ZT-QyE">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Subscription" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2HN-ZT-QyE">
                                                     <rect key="frame" x="20" y="0.0" width="355.5" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
diff --git a/DuckDuckGo/DuckPlayer/DuckNavigationHandling.swift b/DuckDuckGo/DuckPlayer/DuckNavigationHandling.swift
index 33ad44fb25..25365d0266 100644
--- a/DuckDuckGo/DuckPlayer/DuckNavigationHandling.swift
+++ b/DuckDuckGo/DuckPlayer/DuckNavigationHandling.swift
@@ -23,23 +23,11 @@ protocol DuckNavigationHandling {
     var referrer: DuckPlayerReferrer { get set }
     var duckPlayer: DuckPlayerProtocol { get }
     func handleNavigation(_ navigationAction: WKNavigationAction, webView: WKWebView)
-    func handleURLChange(url: URL?, webView: WKWebView)
-    func handleDecidePolicyFor(_ navigationAction: WKNavigationAction, webView: WKWebView)
+    func handleJSNavigation(url: URL?, webView: WKWebView)
+    func handleDecidePolicyFor(_ navigationAction: WKNavigationAction,
+                               completion: @escaping (WKNavigationActionPolicy) -> Void,
+                               webView: WKWebView)
     func handleGoBack(webView: WKWebView)
     func handleReload(webView: WKWebView)
-}
-
-extension WKWebView {
-   
-   func goBack(skippingHistoryItems: Int) {
-       
-       let backList = self.backForwardList.backList
-       guard skippingHistoryItems > 1,
-       let lastElement = backList[safe: backList.count - skippingHistoryItems] else {
-           self.goBack()
-           return
-       }
-       self.go(to: lastElement)
-   }
-   
+    func handleAttach(webView: WKWebView)
 }
diff --git a/DuckDuckGo/DuckPlayer/DuckPlayerNavigationHandler.swift b/DuckDuckGo/DuckPlayer/DuckPlayerNavigationHandler.swift
index bf93b4dd01..7f50c6ad11 100644
--- a/DuckDuckGo/DuckPlayer/DuckPlayerNavigationHandler.swift
+++ b/DuckDuckGo/DuckPlayer/DuckPlayerNavigationHandler.swift
@@ -28,7 +28,6 @@ final class DuckPlayerNavigationHandler {
     var duckPlayer: DuckPlayerProtocol
     var referrer: DuckPlayerReferrer = .other
     var lastHandledVideoID: String?
-    var isDuckPlayerTemporarilyDisabled = false
     
     private struct Constants {
         static let SERPURL =  "https://duckduckgo.com/"
@@ -43,11 +42,11 @@ final class DuckPlayerNavigationHandler {
         static let httpMethod = "GET"
         static let watchInYoutubePath = "openInYoutube"
         static let watchInYoutubeVideoParameter = "v"
+        static let urlInternalReferrer = "embeds_referring_euri"
     }
     
-    init(duckPlayer: DuckPlayerProtocol) {
+    init(duckPlayer: DuckPlayerProtocol = DuckPlayer()) {
         self.duckPlayer = duckPlayer
-        os_log("DP: Trying to load the same video while in DuckPlayer, use Youtube:", log: .duckPlayerLog, type: .debug)
     }
     
     static var htmlTemplatePath: String {
@@ -96,6 +95,37 @@ final class DuckPlayerNavigationHandler {
         performNavigation(duckPlayerRequest, responseHTML: html, webView: webView)
     }
     
+    // Handle URL changes not triggered via Omnibar
+    // such as changes triggered via JS
+    @MainActor
+    private func handleURLChange(url: URL?, webView: WKWebView) {
+
+        guard let url else { return }
+        
+        if let (videoID, _) = url.youtubeVideoParams,
+            videoID == lastHandledVideoID {
+            os_log("DP: URL (%s) already handled, skipping", log: .duckPlayerLog, type: .debug, url.absoluteString)
+            return
+        }
+        
+        // Handle Youtube internal links like "Age restricted" and "Copyright restricted" videos
+         // These should not be handled by DuckPlayer
+        if url.isYoutubeVideo,
+            url.hasWatchInYoutubeQueryParameter {
+                 return
+         }
+                
+        if url.isYoutubeVideo,
+            !url.isDuckPlayer,
+            let (videoID, timestamp) = url.youtubeVideoParams,
+            duckPlayer.settings.mode == .enabled || duckPlayer.settings.mode == .alwaysAsk {
+            
+            os_log("DP: Handling URL change: %s", log: .duckPlayerLog, type: .debug, url.absoluteString)
+            webView.load(URLRequest(url: URL.duckPlayer(videoID, timestamp: timestamp)))
+            lastHandledVideoID = videoID
+        }
+    }
+    
 }
 
 extension DuckPlayerNavigationHandler: DuckNavigationHandling {
@@ -107,28 +137,34 @@ extension DuckPlayerNavigationHandler: DuckNavigationHandling {
         
         os_log("DP: Handling DuckPlayer Player Navigation for %s", log: .duckPlayerLog, type: .debug, navigationAction.request.url?.absoluteString ?? "")
        
+        guard let url = navigationAction.request.url else { return }
+        
+        // Handle Youtube internal links like "Age restricted" and "Copyright restricted" videos
+        // These should not be handled by DuckPlayer
+        if url.isYoutubeVideo,
+           url.hasWatchInYoutubeQueryParameter {
+                return
+        }
+        
         // Handle Open in Youtube Links
         // duck://player/openInYoutube?v=12345
-        if let url = navigationAction.request.url,
-           url.scheme == "duck" {
+        if url.scheme == "duck" {
             let urlComponents = URLComponents(url: url, resolvingAgainstBaseURL: false)
             
             if urlComponents?.path == "/\(Constants.watchInYoutubePath)",
                let queryItems = urlComponents?.queryItems {
                 
                 if let videoParameterItem = queryItems.first(where: { $0.name == Constants.watchInYoutubeVideoParameter }),
-                   let id = videoParameterItem.value {
-                        // Disable DP temporarily
-                        isDuckPlayerTemporarilyDisabled = true
-                        handleURLChange(url: URL.youtube(id, timestamp: nil), webView: webView)
+                   let id = videoParameterItem.value,
+                    let newURL = URL.youtube(id, timestamp: nil).addingWatchInYoutubeQueryParameter() {
+                        webView.load(URLRequest(url: newURL))
                         return
                 }
             }
         }
         
         // Daily Unique View Pixel
-        if let url = navigationAction.request.url,
-           url.isDuckPlayer,
+        if url.isDuckPlayer,
            duckPlayer.settings.mode != .disabled {
             let setting = duckPlayer.settings.mode == .enabled ? Constants.duckPlayerAlwaysString : Constants.duckPlayerDefaultString
             DailyPixel.fire(pixel: Pixel.Event.duckPlayerDailyUniqueView, withAdditionalParameters: [Constants.settingsKey: setting])
@@ -141,136 +177,134 @@ extension DuckPlayerNavigationHandler: DuckNavigationHandling {
         }
         
         // If DuckPlayer is Enabled or in ask mode, render the video
-        if let url = navigationAction.request.url,
-            url.isDuckURLScheme,
+        if url.isDuckURLScheme,
            duckPlayer.settings.mode == .enabled || duckPlayer.settings.mode == .alwaysAsk,
-            !isDuckPlayerTemporarilyDisabled {
+            !url.hasWatchInYoutubeQueryParameter {
             let newRequest = Self.makeDuckPlayerRequest(from: URLRequest(url: url))
             if #available(iOS 15.0, *) {
                 os_log("DP: Loading Simulated Request for %s", log: .duckPlayerLog, type: .debug, navigationAction.request.url?.absoluteString ?? "")
-                performRequest(request: newRequest, webView: webView)
+                                
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+                    self.performRequest(request: newRequest, webView: webView)
+                }
                 return
             }
         }
         
-        // DuckPlayer is disabled, so we redirect to the video in YouTube
-        if let url = navigationAction.request.url,
-            let (videoID, timestamp) = url.youtubeVideoParams,
-            duckPlayer.settings.mode == .disabled {
-            os_log("DP: is Disabled. We should load original video for %s", log: .duckPlayerLog, type: .debug)
-            handleURLChange(url: URL.youtube(videoID, timestamp: timestamp), webView: webView)
-            return
-        }
-    }
-    
-    // Handle URL changes not triggered via Omnibar
-    // such as changes triggered via JS
-    @MainActor
-    func handleURLChange(url: URL?, webView: WKWebView) {
-        
-        // Do not handle the URL if the video was just handled
-        if let url = url,
-           url.isYoutubeVideo || url.isDuckPlayer,
-           let (videoID, _) = url.youtubeVideoParams,
-            lastHandledVideoID == videoID,
-            !isDuckPlayerTemporarilyDisabled {
-                return
-        }
-        
-        if let url = url, url.isYoutubeVideo,
-            !url.isDuckPlayer,
-            let (videoID, timestamp) = url.youtubeVideoParams,
-            duckPlayer.settings.mode == .enabled || duckPlayer.settings.mode == .alwaysAsk {
-            
-            os_log("DP: Handling URL change: %s", log: .duckPlayerLog, type: .debug, url.absoluteString)
-            var newURL = URL.duckPlayer(videoID, timestamp: timestamp)
-            
-            // IF DP is temporarily disabled, load Youtube website
-            // Then reset the setting
-            if isDuckPlayerTemporarilyDisabled {
-                os_log("DP: Duckplayer is temporarily disabled.  Opening Youtube", log: .duckPlayerLog, type: .debug)
-                newURL = URL.youtube(videoID, timestamp: timestamp)
-            } else {
-                os_log("DP: Duckplayer is NOT disabled.  Opening DuckPlayer", log: .duckPlayerLog, type: .debug)
-            }
-            
-            // Load the URL
-            webView.load(URLRequest(url: newURL))
-            
-            // Add a short delay to let the webview start the navigation
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                self.lastHandledVideoID = videoID
-                self.isDuckPlayerTemporarilyDisabled = false
-            }
-        }
     }
     
     // DecidePolicyFor handler to redirect relevant requests
     // to duck://player
     @MainActor
     func handleDecidePolicyFor(_ navigationAction: WKNavigationAction,
+                               completion: @escaping (WKNavigationActionPolicy) -> Void,
                                webView: WKWebView) {
         
-        // Do not handle the URL if the video was just handled
-        if let url = navigationAction.request.url,
-           url.isYoutubeVideo || url.isDuckPlayer,
-           let (videoID, _) = url.youtubeVideoParams,
-            lastHandledVideoID == videoID,
-            !isDuckPlayerTemporarilyDisabled {
-                return
+        guard let url = navigationAction.request.url else {
+            completion(.cancel)
+            return
         }
         
+        if let (videoID, _) = url.youtubeVideoParams,
+           videoID == lastHandledVideoID,
+            !url.hasWatchInYoutubeQueryParameter {
+            os_log("DP: DecidePolicy: URL (%s) already handled, skipping", log: .duckPlayerLog, type: .debug, url.absoluteString)
+            completion(.cancel)
+            return
+        }
+        
+         // Handle Youtube internal links like "Age restricted" and "Copyright restricted" videos
+         // These should not be handled by DuckPlayer
+         if url.isYoutubeVideo,
+            url.hasWatchInYoutubeQueryParameter {
+                completion(.allow)
+                return
+         }
 
         // Pixel for Views From SERP
-        if let url = navigationAction.request.url,
-            navigationAction.request.allHTTPHeaderFields?[Constants.refererHeader] == Constants.SERPURL,
+        if navigationAction.request.allHTTPHeaderFields?[Constants.refererHeader] == Constants.SERPURL,
             duckPlayer.settings.mode == .enabled, !url.isDuckPlayer {
             Pixel.fire(pixel: Pixel.Event.duckPlayerViewFromSERP, debounce: 2)
-        }
-        
-        // Pixel for views from Other Sites
-        if let url = navigationAction.request.url,
-            navigationAction.request.allHTTPHeaderFields?[Constants.refererHeader] != Constants.SERPURL,
-            duckPlayer.settings.mode == .enabled, !url.isDuckPlayer {
+        } else {
             Pixel.fire(pixel: Pixel.Event.duckPlayerViewFromOther, debounce: 2)
         }
         
-        if let url = navigationAction.request.url,
-           url.isYoutubeVideo,
-           !url.isDuckPlayer, let (videoID, timestamp) = url.youtubeVideoParams,
-           duckPlayer.settings.mode == .enabled || duckPlayer.settings.mode == .alwaysAsk {
-            os_log("DP: Handling decidePolicy for Duck Player with %s", log: .duckPlayerLog, type: .debug, url.absoluteString)
-            handleURLChange(url: URL.duckPlayer(videoID, timestamp: timestamp), webView: webView)
-            return
+        if url.isYoutubeVideo,
+           !url.isDuckPlayer,
+            duckPlayer.settings.mode == .enabled || duckPlayer.settings.mode == .alwaysAsk {
+                os_log("DP: Handling decidePolicy for Duck Player with %s", log: .duckPlayerLog, type: .debug, url.absoluteString)
+                completion(.cancel)
+                handleURLChange(url: url, webView: webView)
+                return
         }
+        
+        completion(.allow)
+    }
+    
+    @MainActor
+    func handleJSNavigation(url: URL?, webView: WKWebView) {
+        handleURLChange(url: url, webView: webView)
     }
     
-    // Handle Webview BackButton on DuckPlayer videos
     @MainActor
     func handleGoBack(webView: WKWebView) {
         
-        guard let backURL = webView.backForwardList.backItem?.url,
-                backURL.isYoutubeVideo,
-                backURL.youtubeVideoParams?.videoID == webView.url?.youtubeVideoParams?.videoID,
-                duckPlayer.settings.mode == .enabled else {
+        os_log("DP: Handling Back Navigation", log: .duckPlayerLog, type: .debug)
+        
+        lastHandledVideoID = nil
+        webView.stopLoading()
+        
+        // Check if the back list has items
+        guard !webView.backForwardList.backList.isEmpty else {
             webView.goBack()
             return
         }
-        webView.goBack(skippingHistoryItems: 2)
+        
+        // Find the last non-YouTube video URL in the back list
+        // and navigate to it
+        let backList = webView.backForwardList.backList
+        var nonYoutubeItem: WKBackForwardListItem?
+        
+        for item in backList.reversed() where !item.url.isYoutubeVideo && !item.url.isDuckPlayer {
+            nonYoutubeItem = item
+            break
+        }
+        
+        if let nonYoutubeItem = nonYoutubeItem {
+            os_log("DP: Navigating back to %s", log: .duckPlayerLog, type: .debug, nonYoutubeItem.url.absoluteString)
+            webView.go(to: nonYoutubeItem)
+        } else {
+            os_log("DP: Navigating back to previous page", log: .duckPlayerLog, type: .debug)
+            webView.goBack()
+        }
     }
     
     // Handle Reload for DuckPlayer Videos
     @MainActor
     func handleReload(webView: WKWebView) {
         
+        lastHandledVideoID = nil
+        webView.stopLoading()
         if let url = webView.url, url.isDuckPlayer,
             !url.isDuckURLScheme,
             let (videoID, timestamp) = url.youtubeVideoParams,
-           duckPlayer.settings.mode == .enabled || duckPlayer.settings.mode == .alwaysAsk {
+            duckPlayer.settings.mode == .enabled || duckPlayer.settings.mode == .alwaysAsk {
             os_log("DP: Handling DuckPlayer Reload for %s", log: .duckPlayerLog, type: .debug, url.absoluteString)
             webView.load(URLRequest(url: .duckPlayer(videoID, timestamp: timestamp)))
         } else {
             webView.reload()
         }
     }
+    
+    @MainActor
+    func handleAttach(webView: WKWebView) {
+        
+        if let url = webView.url, url.isDuckPlayer,
+            !url.isDuckURLScheme,
+            duckPlayer.settings.mode == .enabled || duckPlayer.settings.mode == .alwaysAsk {
+            os_log("DP: Handling Initial Load of a video for %s", log: .duckPlayerLog, type: .debug, url.absoluteString)
+            handleReload(webView: webView)
+        }
+        
+    }
 }
diff --git a/DuckDuckGo/DuckPlayer/DuckPlayerURLExtension.swift b/DuckDuckGo/DuckPlayer/DuckPlayerURLExtension.swift
index 5ae878341a..4b89c7bf4d 100644
--- a/DuckDuckGo/DuckPlayer/DuckPlayerURLExtension.swift
+++ b/DuckDuckGo/DuckPlayer/DuckPlayerURLExtension.swift
@@ -124,6 +124,31 @@ extension URL {
         
     }
     
+    func addingWatchInYoutubeQueryParameter() -> URL? {
+        guard var components = URLComponents(url: self, resolvingAgainstBaseURL: false) else {
+            return nil
+        }
+        
+        var queryItems = components.queryItems ?? []
+        queryItems.append(URLQueryItem(name: "embeds_referring_euri", value: "some_value"))
+        components.queryItems = queryItems
+        
+        return components.url
+    }
+    
+    var hasWatchInYoutubeQueryParameter: Bool {
+        guard let components = URLComponents(url: self, resolvingAgainstBaseURL: false),
+              let queryItems = components.queryItems else {
+            return false
+        }
+        
+        for queryItem in queryItems where queryItem.name == "embeds_referring_euri" {
+            return true
+        }
+        
+        return false
+    }
+    
     private func addingTimestamp(_ timestamp: String?) -> URL {
         guard let timestamp = timestamp,
               let regex = try? NSRegularExpression(pattern: "^(\\d+[smh]?)+$"),
diff --git a/DuckDuckGo/HomeCollectionView.swift b/DuckDuckGo/HomeCollectionView.swift
index 9d29f3e9e3..7c1627d54e 100644
--- a/DuckDuckGo/HomeCollectionView.swift
+++ b/DuckDuckGo/HomeCollectionView.swift
@@ -87,7 +87,8 @@ class HomeCollectionView: UICollectionView {
                 renderers.install(renderer: renderer)
 
             case .homeMessage:
-                renderers.install(renderer: HomeMessageViewSectionRenderer(homePageConfiguration: homePageConfiguration))
+                renderers.install(renderer: HomeMessageViewSectionRenderer(homePageConfiguration: homePageConfiguration,
+                                                                           privacyProDataReporter: controller.privacyProDataReporter))
             }
 
         }
diff --git a/DuckDuckGo/HomeMessageCollectionViewCell.swift b/DuckDuckGo/HomeMessageCollectionViewCell.swift
index 0fef1d3598..9267b31748 100644
--- a/DuckDuckGo/HomeMessageCollectionViewCell.swift
+++ b/DuckDuckGo/HomeMessageCollectionViewCell.swift
@@ -26,7 +26,7 @@ final class HomeMessageCollectionViewCell: SwiftUICollectionViewCell<HomeMessage
     static let maximumWidthPad: CGFloat = 455
     
     static var reuseIdentifier = "HomeMessageCell"
-    
+
     func configure(with viewModel: HomeMessageViewModel, parent: UIViewController) {
         embed(in: parent, withView: HomeMessageView(viewModel: viewModel))
         host?.view.frame = contentView.bounds
diff --git a/DuckDuckGo/HomeMessageView.swift b/DuckDuckGo/HomeMessageView.swift
index 5c6834306e..66f2a0895b 100644
--- a/DuckDuckGo/HomeMessageView.swift
+++ b/DuckDuckGo/HomeMessageView.swift
@@ -175,12 +175,12 @@ struct HomeMessageView: View {
             .padding([.bottom], Const.Padding.buttonVerticalInset)
             .sheet(item: $activityItem) { activityItem in
                 ActivityViewController(activityItems: [activityItem.item]) { _, result, _, _ in
-
-                    Pixel.fire(pixel: .remoteMessageSheet, withAdditionalParameters: [
+                    var additionalParameters = [
                         PixelParameters.message: "\(viewModel.messageId)",
                         PixelParameters.sheetResult: "\(result)"
-                    ])
-
+                    ]
+                    additionalParameters = viewModel.onAttachAdditionalParameters?(.messageID(viewModel.messageId), additionalParameters) ?? additionalParameters
+                    Pixel.fire(pixel: .remoteMessageSheet, withAdditionalParameters: additionalParameters)
                 }
                 .modifier(ActivityViewPresentationModifier())
             }
@@ -329,27 +329,27 @@ struct HomeMessageView_Previews: PreviewProvider {
             HomeMessageView(viewModel: HomeMessageViewModel(messageId: "Small",
                                                             sendPixels: false,
                                                             modelType: small,
-                                                            onDidClose: { _ in }, onDidAppear: {}))
+                                                            onDidClose: { _ in }, onDidAppear: {}, onAttachAdditionalParameters: { _, params in params }))
 
             HomeMessageView(viewModel: HomeMessageViewModel(messageId: "Critical",
                                                             sendPixels: false,
                                                             modelType: critical,
-                                                            onDidClose: { _ in }, onDidAppear: {}))
+                                                            onDidClose: { _ in }, onDidAppear: {}, onAttachAdditionalParameters: { _, params in params }))
 
             HomeMessageView(viewModel: HomeMessageViewModel(messageId: "Big Single",
                                                             sendPixels: false,
                                                             modelType: bigSingle,
-                                                            onDidClose: { _ in }, onDidAppear: {}))
+                                                            onDidClose: { _ in }, onDidAppear: {}, onAttachAdditionalParameters: { _, params in params }))
 
             HomeMessageView(viewModel: HomeMessageViewModel(messageId: "Big Two",
                                                             sendPixels: false,
                                                             modelType: bigTwo,
-                                                            onDidClose: { _ in }, onDidAppear: {}))
+                                                            onDidClose: { _ in }, onDidAppear: {}, onAttachAdditionalParameters: { _, params in params }))
 
             HomeMessageView(viewModel: HomeMessageViewModel(messageId: "Promo",
                                                             sendPixels: false,
                                                             modelType: promo,
-                                                            onDidClose: { _ in }, onDidAppear: {}))
+                                                            onDidClose: { _ in }, onDidAppear: {}, onAttachAdditionalParameters: { _, params in params }))
         }
         .frame(height: 200)
         .padding(.horizontal)
diff --git a/DuckDuckGo/HomeMessageViewModel.swift b/DuckDuckGo/HomeMessageViewModel.swift
index 26ddd24d83..4acfe4ead3 100644
--- a/DuckDuckGo/HomeMessageViewModel.swift
+++ b/DuckDuckGo/HomeMessageViewModel.swift
@@ -125,6 +125,7 @@ struct HomeMessageViewModel {
     
     let onDidClose: (ButtonAction?) -> Void
     let onDidAppear: () -> Void
+    let onAttachAdditionalParameters: ((_ useCase: PrivacyProDataReportingUseCase, _ params: [String: String]) -> [String: String])?
 
     func mapActionToViewModel(remoteAction: RemoteAction,
                               buttonAction: HomeMessageViewModel.ButtonAction,
diff --git a/DuckDuckGo/HomeMessageViewModelBuilder.swift b/DuckDuckGo/HomeMessageViewModelBuilder.swift
index 42dd27f6b0..e513ef73d8 100644
--- a/DuckDuckGo/HomeMessageViewModelBuilder.swift
+++ b/DuckDuckGo/HomeMessageViewModelBuilder.swift
@@ -33,6 +33,7 @@ struct HomeMessageViewModelBuilder {
     }
 
     static func build(for remoteMessage: RemoteMessageModel,
+                      with privacyProDataReporter: PrivacyProDataReporting?,
                       onDidClose: @escaping (HomeMessageViewModel.ButtonAction?) -> Void,
                       onDidAppear: @escaping () -> Void) -> HomeMessageViewModel? {
             guard let content = remoteMessage.content else { return nil }
@@ -42,7 +43,10 @@ struct HomeMessageViewModelBuilder {
             sendPixels: remoteMessage.isMetricsEnabled,
             modelType: content,
             onDidClose: onDidClose,
-            onDidAppear: onDidAppear
+            onDidAppear: onDidAppear,
+            onAttachAdditionalParameters: { useCase, params in
+                privacyProDataReporter?.mergeRandomizedParameters(for: useCase, with: params) ?? params
+            }
         )
     }
 
diff --git a/DuckDuckGo/HomeMessageViewSectionRenderer.swift b/DuckDuckGo/HomeMessageViewSectionRenderer.swift
index e039c10062..a0d8df650a 100644
--- a/DuckDuckGo/HomeMessageViewSectionRenderer.swift
+++ b/DuckDuckGo/HomeMessageViewSectionRenderer.swift
@@ -42,12 +42,14 @@ class HomeMessageViewSectionRenderer: NSObject, HomeViewSectionRenderer {
     private weak var controller: HomeViewController?
     
     private let homePageConfiguration: HomePageConfiguration
-    
-    init(homePageConfiguration: HomePageConfiguration) {
+    private let privacyProDataReporter: PrivacyProDataReporting?
+
+    init(homePageConfiguration: HomePageConfiguration, privacyProDataReporter: PrivacyProDataReporting?) {
         self.homePageConfiguration = homePageConfiguration
+        self.privacyProDataReporter = privacyProDataReporter
         super.init()
     }
-    
+
     func install(into controller: HomeViewController) {
         self.controller = controller
         hideLogoIfThereAreMessagesToDisplay()
@@ -113,12 +115,13 @@ class HomeMessageViewSectionRenderer: NSObject, HomeViewSectionRenderer {
                 self?.dismissHomeMessage(message, at: indexPath, in: collectionView)
             } onDidAppear: {
                 // no-op
+            } onAttachAdditionalParameters: { _, params in
+                params
             }
         case .remoteMessage(let remoteMessage):
-            return HomeMessageViewModelBuilder.build(for: remoteMessage) { [weak self] action in
-
+            return HomeMessageViewModelBuilder.build(for: remoteMessage, with: privacyProDataReporter) { [weak self] action in
                 guard let action,
-                        let self else { return }
+                      let self else { return }
 
                 switch action {
 
@@ -128,7 +131,7 @@ class HomeMessageViewSectionRenderer: NSObject, HomeViewSectionRenderer {
                     }
                     if remoteMessage.isMetricsEnabled {
                         Pixel.fire(pixel: .remoteMessageActionClicked,
-                                   withAdditionalParameters: [PixelParameters.message: "\(remoteMessage.id)"])
+                                   withAdditionalParameters: self.additionalParameters(for: remoteMessage.id))
                     }
 
                 case .primaryAction(let isSharing):
@@ -137,7 +140,7 @@ class HomeMessageViewSectionRenderer: NSObject, HomeViewSectionRenderer {
                     }
                     if remoteMessage.isMetricsEnabled {
                         Pixel.fire(pixel: .remoteMessagePrimaryActionClicked,
-                                   withAdditionalParameters: [PixelParameters.message: "\(remoteMessage.id)"])
+                                   withAdditionalParameters: self.additionalParameters(for: remoteMessage.id))
                     }
 
                 case .secondaryAction(let isSharing):
@@ -146,14 +149,14 @@ class HomeMessageViewSectionRenderer: NSObject, HomeViewSectionRenderer {
                     }
                     if remoteMessage.isMetricsEnabled {
                         Pixel.fire(pixel: .remoteMessageSecondaryActionClicked,
-                                   withAdditionalParameters: [PixelParameters.message: "\(remoteMessage.id)"])
+                                   withAdditionalParameters: self.additionalParameters(for: remoteMessage.id))
                     }
 
                 case .close:
                     self.dismissHomeMessage(message, at: indexPath, in: collectionView)
                     if remoteMessage.isMetricsEnabled {
                         Pixel.fire(pixel: .remoteMessageDismissed,
-                                   withAdditionalParameters: [PixelParameters.message: "\(remoteMessage.id)"])
+                                   withAdditionalParameters: self.additionalParameters(for: remoteMessage.id))
                     }
 
                 }
@@ -162,7 +165,13 @@ class HomeMessageViewSectionRenderer: NSObject, HomeViewSectionRenderer {
             }
         }
     }
-    
+
+    private func additionalParameters(for messageID: String) -> [String: String] {
+        let defaultParameters = [PixelParameters.message: "\(messageID)"]
+        return privacyProDataReporter?.mergeRandomizedParameters(for: .messageID(messageID),
+                                                                 with: defaultParameters) ?? defaultParameters
+    }
+
     private func dismissHomeMessage(_ message: HomeMessage,
                                     at indexPath: IndexPath,
                                     in collectionView: UICollectionView) {
diff --git a/DuckDuckGo/HomePageConfiguration.swift b/DuckDuckGo/HomePageConfiguration.swift
index ed9da38ae2..8ddbd84440 100644
--- a/DuckDuckGo/HomePageConfiguration.swift
+++ b/DuckDuckGo/HomePageConfiguration.swift
@@ -45,12 +45,16 @@ final class HomePageConfiguration: HomePageMessagesConfiguration {
     
     private var homeMessageStorage: HomeMessageStorage
     private var remoteMessagingClient: RemoteMessagingClient
+    private let privacyProDataReporter: PrivacyProDataReporting
 
     var homeMessages: [HomeMessage] = []
 
-    init(variantManager: VariantManager? = nil, remoteMessagingClient: RemoteMessagingClient) {
+    init(variantManager: VariantManager? = nil,
+         remoteMessagingClient: RemoteMessagingClient,
+         privacyProDataReporter: PrivacyProDataReporting) {
         homeMessageStorage = HomeMessageStorage(variantManager: variantManager)
         self.remoteMessagingClient = remoteMessagingClient
+        self.privacyProDataReporter = privacyProDataReporter
         homeMessages = buildHomeMessages()
     }
 
@@ -94,20 +98,19 @@ final class HomePageConfiguration: HomePageMessagesConfiguration {
     }
 
     func didAppear(_ homeMessage: HomeMessage) {
-
         switch homeMessage {
         case .remoteMessage(let remoteMessage):
             os_log("Remote message shown: %s", log: .remoteMessaging, type: .info, remoteMessage.id)
             if remoteMessage.isMetricsEnabled {
                 Pixel.fire(pixel: .remoteMessageShown,
-                           withAdditionalParameters: [PixelParameters.message: "\(remoteMessage.id)"])
+                           withAdditionalParameters: additionalParameters(for: remoteMessage.id))
             }
 
             if !remoteMessagingClient.store.hasShownRemoteMessage(withID: remoteMessage.id) {
                 os_log("Remote message shown for first time: %s", log: .remoteMessaging, type: .info, remoteMessage.id)
                 if remoteMessage.isMetricsEnabled {
                     Pixel.fire(pixel: .remoteMessageShownUnique,
-                               withAdditionalParameters: [PixelParameters.message: "\(remoteMessage.id)"])
+                               withAdditionalParameters: additionalParameters(for: remoteMessage.id))
                 }
                 remoteMessagingClient.store.updateRemoteMessage(withID: remoteMessage.id, asShown: true)
             }
@@ -117,4 +120,9 @@ final class HomePageConfiguration: HomePageMessagesConfiguration {
         }
 
     }
+
+    private func additionalParameters(for messageID: String) -> [String: String] {
+        privacyProDataReporter.mergeRandomizedParameters(for: .messageID(messageID),
+                                                         with: [PixelParameters.message: "\(messageID)"])
+    }
 }
diff --git a/DuckDuckGo/HomeViewController.swift b/DuckDuckGo/HomeViewController.swift
index 12323c3891..9996947d1b 100644
--- a/DuckDuckGo/HomeViewController.swift
+++ b/DuckDuckGo/HomeViewController.swift
@@ -77,13 +77,16 @@ class HomeViewController: UIViewController, NewTabPage {
     private var viewModelCancellable: AnyCancellable?
     private var favoritesDisplayModeCancellable: AnyCancellable?
 
+    let privacyProDataReporter: PrivacyProDataReporting
+
     static func loadFromStoryboard(
         homePageConfiguration: HomePageConfiguration,
         model: Tab,
         favoritesViewModel: FavoritesListInteracting,
         appSettings: AppSettings,
         syncService: DDGSyncing,
-        syncDataProviders: SyncDataProviders
+        syncDataProviders: SyncDataProviders,
+        privacyProDataReporter: PrivacyProDataReporting
     ) -> HomeViewController {
         let storyboard = UIStoryboard(name: "Home", bundle: nil)
         let controller = storyboard.instantiateViewController(identifier: "HomeViewController", creator: { coder in
@@ -94,7 +97,8 @@ class HomeViewController: UIViewController, NewTabPage {
                 favoritesViewModel: favoritesViewModel,
                 appSettings: appSettings,
                 syncService: syncService,
-                syncDataProviders: syncDataProviders
+                syncDataProviders: syncDataProviders,
+                privacyProDataReporter: privacyProDataReporter
             )
         })
         return controller
@@ -107,7 +111,8 @@ class HomeViewController: UIViewController, NewTabPage {
         favoritesViewModel: FavoritesListInteracting,
         appSettings: AppSettings,
         syncService: DDGSyncing,
-        syncDataProviders: SyncDataProviders
+        syncDataProviders: SyncDataProviders,
+        privacyProDataReporter: PrivacyProDataReporting
     ) {
         self.homePageConfiguration = homePageConfiguration
         self.tabModel = tabModel
@@ -115,6 +120,7 @@ class HomeViewController: UIViewController, NewTabPage {
         self.appSettings = appSettings
         self.syncService = syncService
         self.syncDataProviders = syncDataProviders
+        self.privacyProDataReporter = privacyProDataReporter
 
         super.init(coder: coder)
     }
diff --git a/DuckDuckGo/MainViewController+Segues.swift b/DuckDuckGo/MainViewController+Segues.swift
index b7f515cbc1..47ff957de8 100644
--- a/DuckDuckGo/MainViewController+Segues.swift
+++ b/DuckDuckGo/MainViewController+Segues.swift
@@ -246,6 +246,14 @@ extension MainViewController {
         }
     }
 
+    func segueToSubscriptionRestoreFlow() {
+        os_log(#function, log: .generalLog, type: .debug)
+        hideAllHighlightsIfNeeded()
+        launchSettings {
+            $0.triggerDeepLinkNavigation(to: .restoreFlow)
+        }
+    }
+
     func segueToDebugSettings() {
         os_log(#function, log: .generalLog, type: .debug)
         hideAllHighlightsIfNeeded()
@@ -289,7 +297,8 @@ extension MainViewController {
                                                   subscriptionManager: AppDependencyProvider.shared.subscriptionManager,
                                                   deepLink: deepLinkTarget,
                                                   historyManager: historyManager,
-                                                  syncPausedStateManager: syncPausedStateManager)
+                                                  syncPausedStateManager: syncPausedStateManager,
+                                                  privacyProDataReporter: privacyProDataReporter)
         Pixel.fire(pixel: .settingsPresented)
 
         if let navigationController = self.presentedViewController as? UINavigationController,
diff --git a/DuckDuckGo/MainViewController.swift b/DuckDuckGo/MainViewController.swift
index 51675e1d04..fe17899cfb 100644
--- a/DuckDuckGo/MainViewController.swift
+++ b/DuckDuckGo/MainViewController.swift
@@ -120,6 +120,8 @@ class MainViewController: UIViewController {
     private var vpnCancellables = Set<AnyCancellable>()
 #endif
 
+    let privacyProDataReporter: PrivacyProDataReporting
+
     private lazy var featureFlagger = AppDependencyProvider.shared.featureFlagger
     
     lazy var menuBookmarksViewModel: MenuBookmarksInteracting = {
@@ -180,7 +182,8 @@ class MainViewController: UIViewController {
         appSettings: AppSettings,
         previewsSource: TabPreviewsSource,
         tabsModel: TabsModel,
-        syncPausedStateManager: any SyncPausedStateManaging
+        syncPausedStateManager: any SyncPausedStateManaging,
+        privacyProDataReporter: PrivacyProDataReporting
     ) {
         self.bookmarksDatabase = bookmarksDatabase
         self.bookmarksDatabaseCleaner = bookmarksDatabaseCleaner
@@ -198,8 +201,10 @@ class MainViewController: UIViewController {
                                      previewsSource: previewsSource,
                                      bookmarksDatabase: bookmarksDatabase,
                                      historyManager: historyManager,
-                                     syncService: syncService)
+                                     syncService: syncService,
+                                     privacyProDataReporter: privacyProDataReporter)
         self.syncPausedStateManager = syncPausedStateManager
+        self.privacyProDataReporter = privacyProDataReporter
         self.homeTabManager = NewTabPageManager()
 
         super.init(nibName: nil, bundle: nil)
@@ -737,7 +742,8 @@ class MainViewController: UIViewController {
             let controller = NewTabPageViewController(interactionModel: favoritesViewModel,
                                                       syncService: syncService,
                                                       syncBookmarksAdapter: syncDataProviders.bookmarksAdapter,
-                                                      homePageMessagesConfiguration: homePageConfiguration)
+                                                      homePageMessagesConfiguration: homePageConfiguration,
+                                                      privacyProDataReporting: privacyProDataReporter)
 
             controller.delegate = self
             controller.shortcutsDelegate = self
@@ -751,7 +757,8 @@ class MainViewController: UIViewController {
                                                                    favoritesViewModel: favoritesViewModel,
                                                                    appSettings: appSettings,
                                                                    syncService: syncService,
-                                                                   syncDataProviders: syncDataProviders)
+                                                                   syncDataProviders: syncDataProviders,
+                                                                   privacyProDataReporter: privacyProDataReporter)
 
             controller.delegate = self
             controller.chromeDelegate = self
@@ -2504,6 +2511,8 @@ extension MainViewController: AutoClearWorker {
             transitionCompletion?()
             self.refreshUIAfterClear()
         } completion: {
+            self.privacyProDataReporter.saveFireCount()
+
             // Ideally this should happen once data clearing has finished AND the animation is finished
             if showNextDaxDialog {
                 self.homeController?.showNextDaxDialog()
diff --git a/DuckDuckGo/NewTabPageMessagesModel.swift b/DuckDuckGo/NewTabPageMessagesModel.swift
index 996d6b7ea2..bae89bebd0 100644
--- a/DuckDuckGo/NewTabPageMessagesModel.swift
+++ b/DuckDuckGo/NewTabPageMessagesModel.swift
@@ -30,13 +30,16 @@ final class NewTabPageMessagesModel: ObservableObject {
     private let homePageMessagesConfiguration: HomePageMessagesConfiguration
     private let notificationCenter: NotificationCenter
     private let pixelFiring: PixelFiring.Type
+    private let privacyProDataReporter: PrivacyProDataReporting?
 
     init(homePageMessagesConfiguration: HomePageMessagesConfiguration,
          notificationCenter: NotificationCenter = .default,
-         pixelFiring: PixelFiring.Type = Pixel.self) {
+         pixelFiring: PixelFiring.Type = Pixel.self,
+         privacyProDataReporter: PrivacyProDataReporting? = nil) {
         self.homePageMessagesConfiguration = homePageMessagesConfiguration
         self.notificationCenter = notificationCenter
         self.pixelFiring = pixelFiring
+        self.privacyProDataReporter = privacyProDataReporter
     }
 
     func load() {
@@ -77,12 +80,13 @@ final class NewTabPageMessagesModel: ObservableObject {
                 self?.dismissHomeMessage(message)
             } onDidAppear: {
                 // no-op
+            } onAttachAdditionalParameters: { _, params in
+                params
             }
         case .remoteMessage(let remoteMessage):
-            return HomeMessageViewModelBuilder.build(for: remoteMessage) { [weak self] action in
-
+            return HomeMessageViewModelBuilder.build(for: remoteMessage, with: privacyProDataReporter) { [weak self] action in
                 guard let action,
-                        let self else { return }
+                      let self else { return }
 
                 switch action {
 
@@ -92,7 +96,7 @@ final class NewTabPageMessagesModel: ObservableObject {
                     }
                     if remoteMessage.isMetricsEnabled {
                         pixelFiring.fire(.remoteMessageActionClicked,
-                                         withAdditionalParameters: [PixelParameters.message: "\(remoteMessage.id)"])
+                                         withAdditionalParameters: self.additionalParameters(for: remoteMessage.id))
                     }
 
                 case .primaryAction(let isSharing):
@@ -101,7 +105,7 @@ final class NewTabPageMessagesModel: ObservableObject {
                     }
                     if remoteMessage.isMetricsEnabled {
                         pixelFiring.fire(.remoteMessagePrimaryActionClicked,
-                                         withAdditionalParameters: [PixelParameters.message: "\(remoteMessage.id)"])
+                                         withAdditionalParameters: self.additionalParameters(for: remoteMessage.id))
                     }
 
                 case .secondaryAction(let isSharing):
@@ -110,14 +114,14 @@ final class NewTabPageMessagesModel: ObservableObject {
                     }
                     if remoteMessage.isMetricsEnabled {
                         pixelFiring.fire(.remoteMessageSecondaryActionClicked,
-                                         withAdditionalParameters: [PixelParameters.message: "\(remoteMessage.id)"])
+                                         withAdditionalParameters: self.additionalParameters(for: remoteMessage.id))
                     }
 
                 case .close:
                     self.dismissHomeMessage(message)
                     if remoteMessage.isMetricsEnabled {
                         pixelFiring.fire(.remoteMessageDismissed,
-                                         withAdditionalParameters: [PixelParameters.message: "\(remoteMessage.id)"])
+                                         withAdditionalParameters: self.additionalParameters(for: remoteMessage.id))
                     }
 
                 }
@@ -126,4 +130,10 @@ final class NewTabPageMessagesModel: ObservableObject {
             }
         }
     }
+
+    private func additionalParameters(for messageID: String) -> [String: String] {
+        let defaultParameters = [PixelParameters.message: "\(messageID)"]
+        return privacyProDataReporter?.mergeRandomizedParameters(for: .messageID(messageID),
+                                                                 with: defaultParameters) ?? defaultParameters
+    }
 }
diff --git a/DuckDuckGo/NewTabPageViewController.swift b/DuckDuckGo/NewTabPageViewController.swift
index 2d5c92fc57..4a97e673a2 100644
--- a/DuckDuckGo/NewTabPageViewController.swift
+++ b/DuckDuckGo/NewTabPageViewController.swift
@@ -35,14 +35,15 @@ final class NewTabPageViewController: UIHostingController<NewTabPageView<Favorit
     init(interactionModel: FavoritesListInteracting,
          syncService: DDGSyncing,
          syncBookmarksAdapter: SyncBookmarksAdapter,
-         homePageMessagesConfiguration: HomePageMessagesConfiguration) {
+         homePageMessagesConfiguration: HomePageMessagesConfiguration,
+         privacyProDataReporting: PrivacyProDataReporting? = nil) {
 
         self.syncService = syncService
         self.syncBookmarksAdapter = syncBookmarksAdapter
 
         self.favoritesModel = FavoritesDefaultModel(interactionModel: interactionModel)
         self.shortcutsModel = ShortcutsModel(shortcutsPreferencesStorage: InMemoryShortcutsPreferencesStorage())
-        let newTabPageView = NewTabPageView(messagesModel: NewTabPageMessagesModel(homePageMessagesConfiguration: homePageMessagesConfiguration),
+        let newTabPageView = NewTabPageView(messagesModel: NewTabPageMessagesModel(homePageMessagesConfiguration: homePageMessagesConfiguration, privacyProDataReporter: privacyProDataReporting),
                                             favoritesModel: favoritesModel,
                                             shortcutsModel: shortcutsModel)
 
diff --git a/DuckDuckGo/OnboardingExperiment/DaxDialogs/DaxDialogView.swift b/DuckDuckGo/OnboardingExperiment/DaxDialogs/DaxDialogView.swift
index 49bf14a78f..7d8afa6cb8 100644
--- a/DuckDuckGo/OnboardingExperiment/DaxDialogs/DaxDialogView.swift
+++ b/DuckDuckGo/OnboardingExperiment/DaxDialogs/DaxDialogView.swift
@@ -109,7 +109,7 @@ struct DaxDialogView<Content: View>: View {
     }
 
     private var daxLogo: some View {
-        Image(.daxIcon)
+        Image(.daxIconExperiment)
             .resizable()
             .matchedGeometryEffect(id: matchLogoAnimation.id, in: matchLogoAnimation.namespace)
             .aspectRatio(contentMode: .fill)
diff --git a/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView+Landing.swift b/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView+Landing.swift
index 379d920fcf..3ef0cc01de 100644
--- a/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView+Landing.swift
+++ b/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView+Landing.swift
@@ -79,7 +79,7 @@ extension OnboardingView {
             let iconSize = Metrics.iconSize.build(v: verticalSizeClass, h: horizontalSizeClass)
 
             return VStack(alignment: .center, spacing: Metrics.welcomeMessageStackSpacing.build(v: verticalSizeClass, h: horizontalSizeClass)) {
-                Image(.daxIcon)
+                Image(.daxIconExperiment)
                     .resizable()
                     .matchedGeometryEffect(id: OnboardingView.daxGeometryEffectID, in: animationNamespace)
                     .frame(width: iconSize.width, height: iconSize.height)
diff --git a/DuckDuckGo/Settings.bundle/Root.plist b/DuckDuckGo/Settings.bundle/Root.plist
index 4645ea5adf..14f4a94038 100644
--- a/DuckDuckGo/Settings.bundle/Root.plist
+++ b/DuckDuckGo/Settings.bundle/Root.plist
@@ -6,7 +6,7 @@
 	<array>
 		<dict>
 			<key>DefaultValue</key>
-			<string>7.129.0</string>
+			<string>7.130.0</string>
 			<key>Key</key>
 			<string>version</string>
 			<key>Title</key>
diff --git a/DuckDuckGo/SettingsRootView.swift b/DuckDuckGo/SettingsRootView.swift
index 415ce3d3bd..4893193bac 100644
--- a/DuckDuckGo/SettingsRootView.swift
+++ b/DuckDuckGo/SettingsRootView.swift
@@ -102,6 +102,13 @@ struct SettingsRootView: View {
                 }
             }
         })
+
+        .onReceive(subscriptionNavigationCoordinator.$shouldPopToAppSettings) { shouldDismiss in
+            if shouldDismiss {
+                shouldDisplayDeepLinkSheet = false
+                shouldDisplayDeepLinkPush = false
+            }
+        }
     }
 
     // MARK: DeepLink Views
@@ -116,7 +123,12 @@ struct SettingsRootView: View {
         case let .subscriptionFlow(origin):
             SubscriptionContainerViewFactory.makeSubscribeFlow(origin: origin,
                                                                navigationCoordinator: subscriptionNavigationCoordinator,
-                                                               subscriptionManager: AppDependencyProvider.shared.subscriptionManager)
+                                                               subscriptionManager: AppDependencyProvider.shared.subscriptionManager,
+                                                               privacyProDataReporter: viewModel.privacyProDataReporter)
+        case .restoreFlow:
+            SubscriptionContainerViewFactory.makeEmailFlow(navigationCoordinator: subscriptionNavigationCoordinator,
+                                                           subscriptionManager: AppDependencyProvider.shared.subscriptionManager,
+                                                           onDisappear: {})
         case .duckPlayer:
             SettingsDuckPlayerView().environmentObject(viewModel)
         default:
diff --git a/DuckDuckGo/SettingsSubscriptionView.swift b/DuckDuckGo/SettingsSubscriptionView.swift
index 615514eab6..afe2fd7085 100644
--- a/DuckDuckGo/SettingsSubscriptionView.swift
+++ b/DuckDuckGo/SettingsSubscriptionView.swift
@@ -94,7 +94,8 @@ struct SettingsSubscriptionView: View {
             
             let subscribeView = SubscriptionContainerViewFactory.makeSubscribeFlow(origin: nil,
                                                                                    navigationCoordinator: subscriptionNavigationCoordinator,
-                                                                                   subscriptionManager: subscriptionManager
+                                                                                   subscriptionManager: subscriptionManager,
+                                                                                   privacyProDataReporter: viewModel.privacyProDataReporter
             ).navigationViewStyle(.stack)
             let restoreView = SubscriptionContainerViewFactory.makeRestoreFlow(navigationCoordinator: subscriptionNavigationCoordinator,
                                                                                subscriptionManager: subscriptionManager)
@@ -131,7 +132,8 @@ struct SettingsSubscriptionView: View {
                         
             let subscribeView = SubscriptionContainerViewFactory.makeSubscribeFlow(origin: nil,
                                                                                    navigationCoordinator: subscriptionNavigationCoordinator,
-                                                                                   subscriptionManager: subscriptionManager
+                                                                                   subscriptionManager: subscriptionManager,
+                                                                                   privacyProDataReporter: viewModel.privacyProDataReporter
             ).navigationViewStyle(.stack)
             NavigationLink(
                 destination: subscribeView,
diff --git a/DuckDuckGo/SettingsViewModel.swift b/DuckDuckGo/SettingsViewModel.swift
index 568c8c0be4..ec791a277b 100644
--- a/DuckDuckGo/SettingsViewModel.swift
+++ b/DuckDuckGo/SettingsViewModel.swift
@@ -44,6 +44,7 @@ final class SettingsViewModel: ObservableObject {
     private let syncPausedStateManager: any SyncPausedStateManaging
     var emailManager: EmailManager { EmailManager() }
     private let historyManager: HistoryManaging
+    let privacyProDataReporter: PrivacyProDataReporting?
 
     // Subscription Dependencies
     private let subscriptionManager: SubscriptionManager
@@ -345,7 +346,8 @@ final class SettingsViewModel: ObservableObject {
          variantManager: VariantManager = AppDependencyProvider.shared.variantManager,
          deepLink: SettingsDeepLinkSection? = nil,
          historyManager: HistoryManaging,
-         syncPausedStateManager: any SyncPausedStateManaging) {
+         syncPausedStateManager: any SyncPausedStateManaging,
+         privacyProDataReporter: PrivacyProDataReporting) {
 
         self.state = SettingsState.defaults
         self.legacyViewProvider = legacyViewProvider
@@ -354,6 +356,7 @@ final class SettingsViewModel: ObservableObject {
         self.deepLinkTarget = deepLink
         self.historyManager = historyManager
         self.syncPausedStateManager = syncPausedStateManager
+        self.privacyProDataReporter = privacyProDataReporter
 
         setupNotificationObservers()
         updateRecentlyVisitedSitesVisibility()
@@ -636,6 +639,7 @@ extension SettingsViewModel {
         case dbp
         case itr
         case subscriptionFlow(origin: String? = nil)
+        case restoreFlow
         case duckPlayer
         // Add other cases as needed
 
@@ -645,6 +649,7 @@ extension SettingsViewModel {
             case .dbp: return "dbp"
             case .itr: return "itr"
             case .subscriptionFlow: return "subscriptionFlow"
+            case .restoreFlow: return "restoreFlow"
             case .duckPlayer: return "duckPlayer"
             // Ensure all cases are covered
             }
diff --git a/DuckDuckGo/Subscription/PrivacyProDataReporting.swift b/DuckDuckGo/Subscription/PrivacyProDataReporting.swift
new file mode 100644
index 0000000000..710b4cf8e9
--- /dev/null
+++ b/DuckDuckGo/Subscription/PrivacyProDataReporting.swift
@@ -0,0 +1,315 @@
+//
+//  PrivacyProDataReporting.swift
+//  DuckDuckGo
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import Core
+import BrowserServicesKit
+import DDGSync
+
+enum PrivacyProPromoParameters: String, CaseIterable {
+    case isReinstall
+    case fireButtonUser = "fireButtonUsed"
+    case syncUsed
+    case fireproofingUsed
+    case appOnboardingCompleted
+    case emailEnabled
+    case widgetAdded
+    case frequentUser
+    case longTermUser
+    case autofillUser
+    case validOpenTabsCount
+    case searchUser
+
+    /// Pick a randomized subset of parameters each time they are attached to a pixel
+    static func randomizedSubset(excluding excludedParameters: [PrivacyProPromoParameters] = []) -> [PrivacyProPromoParameters] {
+        let allParameters = Set(allCases).subtracting(Set(excludedParameters))
+        return Array(allParameters.shuffled().prefix(Int(allCases.count * 2/3)))
+    }
+}
+
+enum PrivacyProDataReportingUseCase {
+    case messageID(String)
+    case origin(String?)
+    case debug
+}
+
+protocol PrivacyProDataReporting {
+    func isReinstall() -> Bool
+    func isFireButtonUser() -> Bool
+    func isSyncUsed() -> Bool
+    func isFireproofingUsed() -> Bool
+    func isAppOnboardingCompleted() -> Bool
+    func isEmailEnabled() -> Bool
+    func isWidgetAdded() -> Bool
+    func isFrequentUser() -> Bool
+    func isLongTermUser() -> Bool
+    func isAutofillUser() -> Bool
+    func isValidOpenTabsCount() -> Bool
+    func isSearchUser() -> Bool
+
+    func injectSyncService(_ service: DDGSync)
+    func injectTabsModel(_ model: TabsModel)
+    func saveFireCount()
+    func saveWidgetAdded() async
+    func saveApplicationLastSessionEnded()
+    func saveSearchCount()
+
+    func randomizedParameters(for useCase: PrivacyProDataReportingUseCase) -> [String: String]
+    func mergeRandomizedParameters(for useCase: PrivacyProDataReportingUseCase, with parameters: [String: String]) -> [String: String]
+}
+
+// swiftlint:disable identifier_name
+final class PrivacyProDataReporter: PrivacyProDataReporting {
+    enum Key {
+        static let fireCountKey = "com.duckduckgo.ios.privacypropromo.FireCount"
+        static let isWidgetAddedKey = "com.duckduckgo.ios.privacypropromo.WidgetAdded"
+        static let applicationLastSessionEndedKey = "com.duckduckgo.ios.privacypropromo.ApplicationLastSessionEnded"
+        static let searchCountKey = "com.duckduckgo.ios.privacypropromo.SearchCount"
+    }
+
+    enum Constants {
+        static let includedOrigins = "origins"
+    }
+
+    private static let fireCountThreshold = 5
+    private static let frequentUserThreshold = 2
+    private static let longTermUserThreshold = 30
+    private static let autofillUserThreshold = 10
+    private static let openTabsCountThreshold = 3
+    private static let searchCountThreshold = 50
+
+    private lazy var includedOrigins = configurationManager
+        .privacyConfig
+        .settings(for: .additionalCampaignPixelParams)[Constants.includedOrigins] as? [String]
+
+    private let configurationManager: PrivacyConfigurationManaging
+    private let variantManager: VariantManager
+    private let userDefaults: UserDefaults
+    private let emailManager: EmailManager
+    private let tutorialSettings: TutorialSettings
+    private let appSettings: AppSettings
+    private let statisticsStore: StatisticsStore
+    private let secureVault: (any AutofillSecureVault)?
+    private var syncService: DDGSyncing?
+    private var tabsModel: TabsModel?
+    private let dateGenerator: () -> Date
+
+    init(configurationManager: PrivacyConfigurationManaging = ContentBlocking.shared.privacyConfigurationManager,
+         variantManager: VariantManager = DefaultVariantManager(),
+         userDefaults: UserDefaults = .app,
+         emailManager: EmailManager = EmailManager(),
+         tutorialSettings: TutorialSettings = DefaultTutorialSettings(),
+         appSettings: AppSettings = AppDependencyProvider.shared.appSettings,
+         statisticsStore: StatisticsStore = StatisticsUserDefaults(),
+         secureVault: (any AutofillSecureVault)? = try? AutofillSecureVaultFactory.makeVault(reporter: SecureVaultReporter()),
+         syncService: DDGSyncing? = nil,
+         tabsModel: TabsModel? = nil,
+         dateGenerator: @escaping () -> Date = Date.init) {
+        self.configurationManager = configurationManager
+        self.variantManager = variantManager
+        self.userDefaults = userDefaults
+        self.emailManager = emailManager
+        self.tutorialSettings = tutorialSettings
+        self.appSettings = appSettings
+        self.statisticsStore = statisticsStore
+        self.secureVault = secureVault
+        self.syncService = syncService
+        self.tabsModel = tabsModel
+        self.dateGenerator = dateGenerator
+    }
+
+    func injectSyncService(_ service: DDGSync) {
+        syncService = service
+    }
+
+    func injectTabsModel(_ model: TabsModel) {
+        tabsModel = model
+    }
+
+    /// Collect a randomized subset of parameters iff the Privacy Pro impression/conversion pixels
+    /// or the Origin Attribution subscription pixel are being fired
+    func randomizedParameters(for useCase: PrivacyProDataReportingUseCase) -> [String: String] {
+        switch useCase {
+        case .messageID(let messageID):
+            guard let includedOrigins, includedOrigins.contains(messageID) else { return [:] }
+        case .origin(let origin):
+            guard let includedOrigins, let origin, includedOrigins.contains(origin) else { return [:] }
+        case .debug:
+            break
+        }
+
+        var additionalParameters = [String: String]()
+
+        /// Exclude certain parameters in case the dependencies aren't ready by the time the pixel is fired
+        var excludedParameters = [PrivacyProPromoParameters]()
+        if syncService == nil {
+            excludedParameters.append(.syncUsed)
+        }
+        if tabsModel == nil {
+            excludedParameters.append(.validOpenTabsCount)
+        }
+
+        let randomizedParameters = PrivacyProPromoParameters.randomizedSubset(excluding: excludedParameters)
+        for parameter in randomizedParameters {
+            let value: Bool
+            switch parameter {
+            case .isReinstall: value = isReinstall()
+            case .fireButtonUser: value = isFireButtonUser()
+            case .syncUsed: value = isSyncUsed()
+            case .fireproofingUsed: value = isFireproofingUsed()
+            case .appOnboardingCompleted: value = isAppOnboardingCompleted()
+            case .emailEnabled: value = isEmailEnabled()
+            case .widgetAdded: value = isWidgetAdded()
+            case .frequentUser: value = isFrequentUser()
+            case .longTermUser: value = isLongTermUser()
+            case .autofillUser: value = isAutofillUser()
+            case .validOpenTabsCount: value = isValidOpenTabsCount()
+            case .searchUser: value = isSearchUser()
+            }
+            additionalParameters[parameter.rawValue] = String(value)
+        }
+
+        return additionalParameters
+    }
+
+    func mergeRandomizedParameters(for useCase: PrivacyProDataReportingUseCase,
+                                   with parameters: [String: String]) -> [String: String] {
+        randomizedParameters(for: useCase).merging(parameters) { $1 }
+    }
+
+    func isReinstall() -> Bool {
+        _variantName == VariantIOS.returningUser.name
+    }
+
+    func isFireButtonUser() -> Bool {
+        _fireCount > Self.fireCountThreshold
+    }
+
+    func isSyncUsed() -> Bool {
+        _syncAuthState != .inactive
+    }
+
+    func isFireproofingUsed() -> Bool {
+        _fireproofedDomainsCount > 0
+    }
+
+    func isAppOnboardingCompleted() -> Bool {
+        tutorialSettings.hasSeenOnboarding
+    }
+
+    func isEmailEnabled() -> Bool {
+        emailManager.isSignedIn
+    }
+
+    func isWidgetAdded() -> Bool {
+        userDefaults.bool(forKey: Key.isWidgetAddedKey, defaultValue: false)
+    }
+
+    func isFrequentUser() -> Bool {
+        let now = dateGenerator()
+        guard let _lastSessionEnded,
+              let daysSinceLastSession = Calendar.current.numberOfDaysBetween(_lastSessionEnded, and: now) else {
+            return false
+        }
+        return daysSinceLastSession < Self.frequentUserThreshold
+    }
+
+    func isLongTermUser() -> Bool {
+        guard let _installDate,
+              let daysSinceInstall = Calendar.current.numberOfDaysBetween(_installDate, and: dateGenerator()) else {
+            return false
+        }
+        return daysSinceInstall > Self.longTermUserThreshold
+    }
+
+    func isAutofillUser() -> Bool {
+        _accountsCount > Self.autofillUserThreshold
+    }
+
+    func isValidOpenTabsCount() -> Bool {
+         _tabsCount > Self.openTabsCountThreshold
+    }
+
+    func isSearchUser() -> Bool {
+        _searchCount > Self.searchCountThreshold
+    }
+
+    func saveWidgetAdded() async {
+        let isInstalled = await appSettings.isWidgetInstalled()
+        if isInstalled != isWidgetAdded() {
+            userDefaults.set(isInstalled, forKey: Key.isWidgetAddedKey)
+        }
+    }
+
+    func saveApplicationLastSessionEnded() {
+        userDefaults.set(dateGenerator(), forKey: Key.applicationLastSessionEndedKey)
+    }
+    
+    func saveFireCount() {
+        userDefaults.set(_fireCount + 1, forKey: Key.fireCountKey)
+    }
+
+    func saveSearchCount() {
+        userDefaults.set(_searchCount + 1, forKey: Key.searchCountKey)
+    }
+
+    var _syncAuthState: SyncAuthState {
+        guard let syncService else {
+            preconditionFailure("syncService must be non-nil")
+        }
+        return syncService.authState
+    }
+
+    var _variantName: String? {
+        variantManager.currentVariant?.name
+    }
+
+    var _fireCount: Int {
+        userDefaults.object(forKey: Key.fireCountKey) as? Int ?? 0
+    }
+
+    var _fireproofedDomainsCount: Int {
+        PreserveLogins.shared.allowedDomains.count
+    }
+
+    var _lastSessionEnded: Date? {
+        userDefaults.object(forKey: Key.applicationLastSessionEndedKey) as? Date ?? nil
+    }
+
+    var _installDate: Date? {
+        statisticsStore.installDate
+    }
+
+    var _accountsCount: Int {
+        (try? secureVault?.accountsCount()) ?? 0
+    }
+
+    var _tabsCount: Int {
+        guard let tabsModel else {
+            preconditionFailure("tabsModel must be non-nil")
+        }
+
+        return tabsModel.count
+    }
+
+    var _searchCount: Int {
+        userDefaults.object(forKey: Key.searchCountKey) as? Int ?? 0
+    }
+}
+// swiftlint:enable identifier_name
diff --git a/DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift b/DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift
index a4f4815214..c266490059 100644
--- a/DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift
+++ b/DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift
@@ -94,17 +94,20 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature, ObservableObjec
     private let appStorePurchaseFlow: AppStorePurchaseFlow
     private let appStoreRestoreFlow: AppStoreRestoreFlow
     private let appStoreAccountManagementFlow: AppStoreAccountManagementFlow
+    private let privacyProDataReporter: PrivacyProDataReporting?
 
     init(subscriptionManager: SubscriptionManager,
          subscriptionAttributionOrigin: String?,
          appStorePurchaseFlow: AppStorePurchaseFlow,
          appStoreRestoreFlow: AppStoreRestoreFlow,
-         appStoreAccountManagementFlow: AppStoreAccountManagementFlow) {
+         appStoreAccountManagementFlow: AppStoreAccountManagementFlow,
+         privacyProDataReporter: PrivacyProDataReporting? = nil) {
         self.subscriptionManager = subscriptionManager
         self.appStorePurchaseFlow = appStorePurchaseFlow
         self.appStoreRestoreFlow = appStoreRestoreFlow
         self.appStoreAccountManagementFlow = appStoreAccountManagementFlow
         self.subscriptionAttributionOrigin = subscriptionAttributionOrigin
+        self.privacyProDataReporter = subscriptionAttributionOrigin != nil ? privacyProDataReporter : nil
     }
 
     // Transaction Status and errors are observed from ViewModels to handle errors in the UI
@@ -264,7 +267,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature, ObservableObjec
         case .success(let purchaseUpdate):
             DailyPixel.fireDailyAndCount(pixel: .privacyProPurchaseSuccess)
             UniquePixel.fire(pixel: .privacyProSubscriptionActivated)
-            Pixel.fireAttribution(pixel: .privacyProSuccessfulSubscriptionAttribution, origin: subscriptionAttributionOrigin)
+            Pixel.fireAttribution(pixel: .privacyProSuccessfulSubscriptionAttribution, origin: subscriptionAttributionOrigin, privacyProDataReporter: privacyProDataReporter)
             setTransactionStatus(.idle)
             await pushPurchaseUpdate(originalMessage: message, purchaseUpdate: purchaseUpdate)
         case .failure:
@@ -441,13 +444,16 @@ private extension Pixel {
         static let locale = "locale"
     }
 
-    static func fireAttribution(pixel: Pixel.Event, origin: String?, locale: Locale = .current) {
+    static func fireAttribution(pixel: Pixel.Event, origin: String?, locale: Locale = .current, privacyProDataReporter: PrivacyProDataReporting?) {
         var parameters: [String: String] = [:]
         parameters[AttributionParameters.locale] = locale.identifier
         if let origin {
             parameters[AttributionParameters.origin] = origin
         }
-        Self.fire(pixel: pixel, withAdditionalParameters: parameters)
+        Self.fire(
+            pixel: pixel,
+            withAdditionalParameters: privacyProDataReporter?.mergeRandomizedParameters(for: .origin(origin), with: parameters) ?? parameters
+        )
     }
 
 }
diff --git a/DuckDuckGo/Subscription/Views/SubscriptionContainerViewFactory.swift b/DuckDuckGo/Subscription/Views/SubscriptionContainerViewFactory.swift
index 8b49dd0a8d..05d06609f9 100644
--- a/DuckDuckGo/Subscription/Views/SubscriptionContainerViewFactory.swift
+++ b/DuckDuckGo/Subscription/Views/SubscriptionContainerViewFactory.swift
@@ -23,7 +23,7 @@ import Subscription
 @available(iOS 15.0, *)
 enum SubscriptionContainerViewFactory {
 
-    static func makeSubscribeFlow(origin: String?, navigationCoordinator: SubscriptionNavigationCoordinator, subscriptionManager: SubscriptionManager) -> some View {
+    static func makeSubscribeFlow(origin: String?, navigationCoordinator: SubscriptionNavigationCoordinator, subscriptionManager: SubscriptionManager, privacyProDataReporter: PrivacyProDataReporting?) -> some View {
         let appStoreRestoreFlow = DefaultAppStoreRestoreFlow(accountManager: subscriptionManager.accountManager,
                                                              storePurchaseManager: subscriptionManager.storePurchaseManager(),
                                                              subscriptionEndpointService: subscriptionManager.subscriptionEndpointService,
@@ -45,7 +45,8 @@ enum SubscriptionContainerViewFactory {
                                                                 subscriptionAttributionOrigin: origin,
                                                                 appStorePurchaseFlow: appStorePurchaseFlow,
                                                                 appStoreRestoreFlow: appStoreRestoreFlow,
-                                                                appStoreAccountManagementFlow: appStoreAccountManagementFlow)
+                                                                appStoreAccountManagementFlow: appStoreAccountManagementFlow,
+                                                                privacyProDataReporter: privacyProDataReporter)
         )
         return SubscriptionContainerView(currentView: .subscribe, viewModel: viewModel)
             .environmentObject(navigationCoordinator)
diff --git a/DuckDuckGo/SubscriptionDebugViewController.swift b/DuckDuckGo/SubscriptionDebugViewController.swift
index 9a2dba8630..b57c1b3e69 100644
--- a/DuckDuckGo/SubscriptionDebugViewController.swift
+++ b/DuckDuckGo/SubscriptionDebugViewController.swift
@@ -33,29 +33,34 @@ import NetworkProtection
         AppDependencyProvider.shared.subscriptionManager
     }
 
+    // swiftlint:disable:next force_cast
+    private let reporter = (UIApplication.shared.delegate as! AppDelegate).privacyProDataReporter as! PrivacyProDataReporter
+
     private let titles = [
         Sections.authorization: "Authentication",
-        Sections.subscription: "Subscription",
+        Sections.api: "Make API Call",
         Sections.appstore: "App Store",
         Sections.environment: "Environment",
+        Sections.pixels: "Promo Pixel Parameters",
     ]
 
     enum Sections: Int, CaseIterable {
         case authorization
-        case subscription
+        case api
         case appstore
         case environment
+        case pixels
     }
 
     enum AuthorizationRows: Int, CaseIterable {
-        case showAccountDetails
+        case restoreSubscription
         case clearAuthData
-        case injectCredentials
+        case showAccountDetails
     }
     
     enum SubscriptionRows: Int, CaseIterable {
         case validateToken
-        case getEntitlements
+        case checkEntitlements
         case getSubscription
     }
     
@@ -68,6 +73,10 @@ import NetworkProtection
         case production
     }
 
+    enum PixelsRows: Int, CaseIterable {
+        case randomize
+    }
+
     override func numberOfSections(in tableView: UITableView) -> Int {
         return Sections.allCases.count
     }
@@ -87,18 +96,29 @@ import NetworkProtection
 
         case .authorization:
             switch AuthorizationRows(rawValue: indexPath.row) {
+            case .restoreSubscription:
+                cell.textLabel?.text = "I Have a Subscription"
             case .clearAuthData:
-                cell.textLabel?.text = "Clear Authorization Data (Sign out)"
+                cell.textLabel?.text = "Remove Subscription From This Device"
             case .showAccountDetails:
                 cell.textLabel?.text = "Show Account Details"
-            case .injectCredentials:
-                cell.textLabel?.text = "Simulate Authentication (Inject Fake token)"
             case .none:
                 break
             }
 
-        case.none:
-            break
+        case .api:
+            switch SubscriptionRows(rawValue: indexPath.row) {
+            case .validateToken:
+                cell.textLabel?.text = "Validate Token"
+            case .checkEntitlements:
+                cell.textLabel?.text = "Check Entitlements"
+            case .getSubscription:
+                cell.textLabel?.text = "Get Subscription Details"
+
+            case .none:
+                break
+            }
+
         
         case .appstore:
             switch AppStoreRows(rawValue: indexPath.row) {
@@ -107,18 +127,6 @@ import NetworkProtection
             case .none:
                 break
             }
-            
-        case .subscription:
-            switch SubscriptionRows(rawValue: indexPath.row) {
-            case .validateToken:
-                cell.textLabel?.text = "Validate Token"
-            case .getSubscription:
-                cell.textLabel?.text = "Get subscription details"
-            case .getEntitlements:
-                cell.textLabel?.text = "Get Entitlements"
-            case .none:
-                break
-            }
         
         case .environment:
             let currentEnv = subscriptionManager.currentEnvironment.serviceEnvironment
@@ -132,16 +140,28 @@ import NetworkProtection
             case .none:
                 break
             }
+
+        case .pixels:
+            switch PixelsRows(rawValue: indexPath.row) {
+            case .randomize:
+                cell.textLabel?.text = "Show Randomized Parameters"
+            case .none:
+                break
+            }
+        case .none:
+            break
         }
+
         return cell
     }
 
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         switch Sections(rawValue: section) {
         case .authorization: return AuthorizationRows.allCases.count
-        case .subscription: return SubscriptionRows.allCases.count
+        case .api: return SubscriptionRows.allCases.count
         case .appstore: return AppStoreRows.allCases.count
         case .environment: return EnvironmentRows.allCases.count
+        case .pixels: return PixelsRows.allCases.count
         case .none: return 0
 
         }
@@ -151,9 +171,9 @@ import NetworkProtection
         switch Sections(rawValue: indexPath.section) {
         case .authorization:
             switch AuthorizationRows(rawValue: indexPath.row) {
+            case .restoreSubscription: openSubscriptionRestoreFlow()
             case .clearAuthData: clearAuthData()
             case .showAccountDetails: showAccountDetails()
-            case .injectCredentials: injectCredentials()
             default: break
             }
         case .appstore:
@@ -161,16 +181,21 @@ import NetworkProtection
             case .syncAppStoreAccount: syncAppleIDAccount()
             default: break
             }
-        case .subscription:
+        case .api:
             switch SubscriptionRows(rawValue: indexPath.row) {
             case .validateToken: validateToken()
-            case .getSubscription: getSubscription()
-            case .getEntitlements: getEntitlements()
+            case .checkEntitlements: checkEntitlements()
+            case .getSubscription: getSubscriptionDetails()
             default: break
             }
         case .environment:
             guard let subEnv: EnvironmentRows = EnvironmentRows(rawValue: indexPath.row) else { return }
             changeSubscriptionEnvironment(envRows: subEnv)
+        case .pixels:
+            switch PixelsRows(rawValue: indexPath.row) {
+            case .randomize: showRandomizedParamters()
+            default: break
+            }
         case .none:
             break
         }
@@ -221,18 +246,30 @@ import NetworkProtection
 //    func showAlert(title: String, message: String, alternativeAction)
 
     // MARK: Account Status Actions
+
+    private func openSubscriptionRestoreFlow() {
+        guard let mainVC = view.window?.rootViewController as? MainViewController else { return }
+
+        
+        if let navigationController = mainVC.presentedViewController as? UINavigationController {
+            
+            navigationController.popToRootViewController {
+                if navigationController.viewControllers.first is SettingsHostingController {
+                    mainVC.segueToSubscriptionRestoreFlow()
+                } else {
+                    navigationController.dismiss(animated: true, completion: {
+                        mainVC.segueToSubscriptionRestoreFlow()
+                    })
+                }
+            }
+        }
+    }
+
     private func clearAuthData() {
         subscriptionManager.accountManager.signOut()
         showAlert(title: "Data cleared!")
     }
     
-    private func injectCredentials() {
-        subscriptionManager.accountManager.storeAccount(token: "a-fake-token",
-                                    email: "a.fake@email.com",
-                                    externalID: "666")
-        showAccountDetails()
-    }
-    
     private func showAccountDetails() {
         let title = subscriptionManager.accountManager.isUserAuthenticated ? "Authenticated" : "Not Authenticated"
         let message = subscriptionManager.accountManager.isUserAuthenticated ?
@@ -242,7 +279,31 @@ import NetworkProtection
             "Email: \(subscriptionManager.accountManager.email ?? "")"].joined(separator: "\n") : nil
         showAlert(title: title, message: message)
     }
-            
+
+    private func showRandomizedParamters() {
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateStyle = .short
+        dateFormatter.timeStyle = .none
+        let reportedParameters = reporter.randomizedParameters(for: .debug).map { "\($0.key)=\($0.value)" }
+        let message = """
+                isReinstall=\(reporter.isReinstall().toString) (variant=\(reporter._variantName ?? "unknown"))
+                fireButtonUsed=\(reporter.isFireButtonUser().toString) (count=\(reporter._fireCount))
+                syncUsed=\(reporter.isSyncUsed().toString) (state=\(reporter._syncAuthState.rawValue))
+                fireproofingUsed=\(reporter.isFireproofingUsed().toString) (count=\(reporter._fireproofedDomainsCount))
+                appOnboardingCompleted=\(reporter.isAppOnboardingCompleted().toString)
+                emailEnabled=\(reporter.isEmailEnabled().toString)
+                widgetAdded=\(reporter.isWidgetAdded().toString)
+                frequentUser=\(reporter.isFrequentUser().toString) (lastSession=\(dateFormatter.string(from: reporter._lastSessionEnded ?? .distantPast)))
+                longTermUser=\(reporter.isLongTermUser().toString) (installDate=\(dateFormatter.string(from: reporter._installDate ?? .distantPast)))
+                autofillUser=\(reporter.isAutofillUser().toString) (count=\(reporter._accountsCount))
+                validOpenTabsCount=\(reporter.isValidOpenTabsCount().toString) (count=\(reporter._tabsCount))
+                searchUser=\(reporter.isSearchUser().toString) (count=\(reporter._searchCount))
+
+                Randomized: \(reportedParameters.joined(separator: ", "))
+                """
+        showAlert(title: "", message: message)
+    }
+
     private func syncAppleIDAccount() {
         Task {
             do {
@@ -271,7 +332,7 @@ import NetworkProtection
         }
     }
     
-    private func getSubscription() {
+    private func getSubscriptionDetails() {
         Task {
             guard let token = subscriptionManager.accountManager.accessToken else {
                 showAlert(title: "Not authenticated", message: "No authenticated user found! - Subscription not available")
@@ -287,7 +348,7 @@ import NetworkProtection
         }
     }
     
-    private func getEntitlements() {
+    private func checkEntitlements() {
         Task {
             var results: [String] = []
             guard subscriptionManager.accountManager.accessToken != nil else {
@@ -332,3 +393,9 @@ import NetworkProtection
         }
     }
 }
+
+extension Bool {
+    fileprivate var toString: String {
+        String(self)
+    }
+}
diff --git a/DuckDuckGo/TabManager.swift b/DuckDuckGo/TabManager.swift
index 12ed099455..cd598927a1 100644
--- a/DuckDuckGo/TabManager.swift
+++ b/DuckDuckGo/TabManager.swift
@@ -35,7 +35,8 @@ class TabManager {
     private let historyManager: HistoryManaging
     private let syncService: DDGSyncing
     private var previewsSource: TabPreviewsSource
-    private var duckPlayerNavigationHandler: DuckNavigationHandling
+    private var duckPlayer: DuckPlayerProtocol
+    private var privacyProDataReporter: PrivacyProDataReporting
 
     weak var delegate: TabDelegate?
 
@@ -47,16 +48,16 @@ class TabManager {
          previewsSource: TabPreviewsSource,
          bookmarksDatabase: CoreDataDatabase,
          historyManager: HistoryManaging,
-         syncService: DDGSyncing) {
+         syncService: DDGSyncing,
+         duckPlayer: DuckPlayer = DuckPlayer(),
+         privacyProDataReporter: PrivacyProDataReporting) {
         self.model = model
         self.previewsSource = previewsSource
         self.bookmarksDatabase = bookmarksDatabase
         self.historyManager = historyManager
         self.syncService = syncService
-        
-        // Init Duck Player Handler
-        self.duckPlayerNavigationHandler = DuckPlayerNavigationHandler(duckPlayer: DuckPlayer())
-
+        self.duckPlayer = duckPlayer
+        self.privacyProDataReporter = privacyProDataReporter
         registerForNotifications()
     }
 
@@ -73,7 +74,8 @@ class TabManager {
                                                               bookmarksDatabase: bookmarksDatabase,
                                                               historyManager: historyManager,
                                                               syncService: syncService,
-                                                              duckPlayerNavigationHandler: duckPlayerNavigationHandler)
+                                                              duckPlayer: duckPlayer,
+                                                              privacyProDataReporter: privacyProDataReporter)
         controller.applyInheritedAttribution(inheritedAttribution)
         controller.attachWebView(configuration: configuration,
                                  andLoadRequest: url == nil ? nil : URLRequest.userInitiated(url!),
@@ -146,7 +148,8 @@ class TabManager {
                                                               bookmarksDatabase: bookmarksDatabase,
                                                               historyManager: historyManager,
                                                               syncService: syncService,
-                                                              duckPlayerNavigationHandler: duckPlayerNavigationHandler)
+                                                              duckPlayer: duckPlayer,
+                                                              privacyProDataReporter: privacyProDataReporter)
         controller.attachWebView(configuration: configCopy,
                                  andLoadRequest: request,
                                  consumeCookies: !model.hasActiveTabs,
diff --git a/DuckDuckGo/TabViewController.swift b/DuckDuckGo/TabViewController.swift
index 5f3aa279e8..6d40815662 100644
--- a/DuckDuckGo/TabViewController.swift
+++ b/DuckDuckGo/TabViewController.swift
@@ -143,6 +143,8 @@ class TabViewController: UIViewController {
     }
 #endif
 
+    let privacyProDataReporter: PrivacyProDataReporting
+
     // Required to know when to disable autofill, see SaveLoginViewModel for details
     // Stored in memory on TabViewController for privacy reasons
     private var domainSaveLoginPromptLastShownOn: String?
@@ -295,7 +297,8 @@ class TabViewController: UIViewController {
                                    bookmarksDatabase: CoreDataDatabase,
                                    historyManager: HistoryManaging,
                                    syncService: DDGSyncing,
-                                   duckPlayerNavigationHandler: DuckNavigationHandling) -> TabViewController {
+                                   duckPlayer: DuckPlayerProtocol,
+                                   privacyProDataReporter: PrivacyProDataReporting) -> TabViewController {
         let storyboard = UIStoryboard(name: "Tab", bundle: nil)
         let controller = storyboard.instantiateViewController(identifier: "TabViewController", creator: { coder in
             TabViewController(coder: coder,
@@ -304,7 +307,8 @@ class TabViewController: UIViewController {
                               bookmarksDatabase: bookmarksDatabase,
                               historyManager: historyManager,
                               syncService: syncService,
-                              duckPlayerNavigationHandler: duckPlayerNavigationHandler)
+                              duckPlayer: duckPlayer,
+                              privacyProDataReporter: privacyProDataReporter)
         })
         return controller
     }
@@ -315,7 +319,8 @@ class TabViewController: UIViewController {
 
     let historyManager: HistoryManaging
     let historyCapture: HistoryCapture
-    var duckPlayerNavigationHandler: DuckNavigationHandling
+    var duckPlayer: DuckPlayerProtocol
+    var duckPlayerNavigationHandler: DuckNavigationHandling?
     
     required init?(coder aDecoder: NSCoder,
                    tabModel: Tab,
@@ -323,14 +328,17 @@ class TabViewController: UIViewController {
                    bookmarksDatabase: CoreDataDatabase,
                    historyManager: HistoryManaging,
                    syncService: DDGSyncing,
-                   duckPlayerNavigationHandler: DuckNavigationHandling) {
+                   duckPlayer: DuckPlayerProtocol,
+                   privacyProDataReporter: PrivacyProDataReporting) {
         self.tabModel = tabModel
         self.appSettings = appSettings
         self.bookmarksDatabase = bookmarksDatabase
         self.historyManager = historyManager
         self.historyCapture = HistoryCapture(historyManager: historyManager)
         self.syncService = syncService
-        self.duckPlayerNavigationHandler = duckPlayerNavigationHandler
+        self.duckPlayer = duckPlayer
+        self.duckPlayerNavigationHandler = DuckPlayerNavigationHandler(duckPlayer: duckPlayer)
+        self.privacyProDataReporter = privacyProDataReporter
         super.init(coder: aDecoder)
     }
 
@@ -408,6 +416,9 @@ class TabViewController: UIViewController {
         resetNavigationBar()
         delegate?.tabDidRequestShowingMenuHighlighter(tab: self)
         tabModel.viewed = true
+        
+        // Link DuckPlayer to current Tab
+        duckPlayerNavigationHandler?.duckPlayer.setHostViewController(self)
     }
 
     override func buildActivities() -> [UIActivity] {
@@ -514,6 +525,12 @@ class TabViewController: UIViewController {
                 // break a js-initiated popup request such as printing from a popup
                 guard self?.url != cleanURLRequest.url || loadingStopped || !loadingInitiatedByParentTab else { return }
                 self?.load(urlRequest: cleanURLRequest)
+                
+                
+                if let handler = self?.duckPlayerNavigationHandler,
+                    let webView = self?.webView {
+                    handler.handleAttach(webView: webView)
+                }
             })
         }
 
@@ -679,16 +696,20 @@ class TabViewController: UIViewController {
             url = webView.url
         } else if let currentHost = url?.host, let newHost = webView.url?.host, currentHost == newHost {
             url = webView.url
-                        
+            
+            // decideForPolicy is not called for JS navigation
+            // This ensures DuckPlayer works on internal JS navigation based on
+            // URL Changes
+            
             if let url,
                 url.isYoutubeVideo,
-                duckPlayerNavigationHandler.duckPlayer.settings.mode == .enabled {
-                duckPlayerNavigationHandler.handleURLChange(url: url, webView: webView)
+               duckPlayerNavigationHandler?.duckPlayer.settings.mode == .enabled {
+                duckPlayerNavigationHandler?.handleJSNavigation(url: url, webView: webView)
             }
+             
         }
-                
         if let url {
-            duckPlayerNavigationHandler.referrer = url.isYoutube ? .youtube : .other
+            duckPlayerNavigationHandler?.referrer = url.isYoutube ? .youtube : .other
         }
     }
     
@@ -741,7 +762,7 @@ class TabViewController: UIViewController {
         updateContentMode()
         cachedRuntimeConfigurationForDomain = [:]
         if let url = webView.url, url.isDuckPlayer {
-            duckPlayerNavigationHandler.handleReload(webView: webView)
+            duckPlayerNavigationHandler?.handleReload(webView: webView)
         } else {
             webView.reload()
         }
@@ -756,7 +777,8 @@ class TabViewController: UIViewController {
         dismissJSAlertIfNeeded()
         
         if let url = url, url.isDuckPlayer {
-            duckPlayerNavigationHandler.handleGoBack(webView: webView)
+            webView.stopLoading()
+            duckPlayerNavigationHandler?.handleGoBack(webView: webView)
             chromeDelegate?.omniBar.resignFirstResponder()
             return
         }
@@ -1616,6 +1638,7 @@ extension TabViewController: WKNavigationDelegate {
                navigationAction.isTargetingMainFrame() {
                 if url.isDuckDuckGoSearch {
                     StatisticsLoader.shared.refreshSearchRetentionAtb()
+                    privacyProDataReporter.saveSearchCount()
                 }
 
                 self.delegate?.closeFindInPage(tab: self)
@@ -1673,9 +1696,10 @@ extension TabViewController: WKNavigationDelegate {
         
         if navigationAction.isTargetingMainFrame(),
             url.isYoutubeVideo,
-            duckPlayerNavigationHandler.duckPlayer.settings.mode == .enabled {
-            duckPlayerNavigationHandler.handleDecidePolicyFor(navigationAction, webView: webView)
-            completion(.allow)
+           duckPlayerNavigationHandler?.duckPlayer.settings.mode == .enabled {
+            duckPlayerNavigationHandler?.handleDecidePolicyFor(navigationAction,
+                                                              completion: completion,
+                                                              webView: webView)
             return
         }
         
@@ -1696,7 +1720,7 @@ extension TabViewController: WKNavigationDelegate {
             performBlobNavigation(navigationAction, completion: completion)
         
         case .duck:
-            duckPlayerNavigationHandler.handleNavigation(navigationAction, webView: webView)
+            duckPlayerNavigationHandler?.handleNavigation(navigationAction, webView: webView)
             completion(.cancel)
             return
             
@@ -2347,7 +2371,7 @@ extension TabViewController: UserContentControllerDelegate {
         userScripts.autoconsentUserScript.delegate = self
         
         // Setup DuckPlayer
-        userScripts.duckPlayer = duckPlayerNavigationHandler.duckPlayer
+        userScripts.duckPlayer = duckPlayerNavigationHandler?.duckPlayer
         userScripts.youtubeOverlayScript?.webView = webView
         userScripts.youtubePlayerUserScript?.webView = webView
         
diff --git a/DuckDuckGo/TabViewControllerLongPressMenuExtension.swift b/DuckDuckGo/TabViewControllerLongPressMenuExtension.swift
index b25fb38e35..64d08503ea 100644
--- a/DuckDuckGo/TabViewControllerLongPressMenuExtension.swift
+++ b/DuckDuckGo/TabViewControllerLongPressMenuExtension.swift
@@ -106,7 +106,8 @@ extension TabViewController {
                                                                  bookmarksDatabase: bookmarksDatabase,
                                                                  historyManager: historyManager,
                                                                  syncService: syncService,
-                                                                 duckPlayerNavigationHandler: duckPlayerNavigationHandler)
+                                                                 duckPlayer: duckPlayer,
+                                                                 privacyProDataReporter: privacyProDataReporter)
         tabController.isLinkPreview = true
         let configuration = WKWebViewConfiguration.nonPersistent()
         tabController.attachWebView(configuration: configuration, andLoadRequest: URLRequest.userInitiated(url), consumeCookies: false)
diff --git a/DuckDuckGo/UINavigationControllerExtension.swift b/DuckDuckGo/UINavigationControllerExtension.swift
new file mode 100644
index 0000000000..47e7532e54
--- /dev/null
+++ b/DuckDuckGo/UINavigationControllerExtension.swift
@@ -0,0 +1,45 @@
+//
+//  UINavigationControllerExtension.swift
+//  DuckDuckGo
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import UIKit
+
+extension UINavigationController {
+
+    func popToRootViewController(animated: Bool = true, completion: @escaping () -> Void) {
+        CATransaction.begin()
+        CATransaction.setCompletionBlock(completion)
+        self.popToRootViewController(animated: animated)
+        CATransaction.commit()
+    }
+
+    func popViewControllerWithHandler(animated: Bool = true, completion: @escaping () -> Void) {
+        CATransaction.begin()
+        CATransaction.setCompletionBlock(completion)
+        self.popViewController(animated: animated)
+        CATransaction.commit()
+    }
+
+    func pushViewController(viewController: UIViewController, animated: Bool = true, completion: @escaping () -> Void) {
+        CATransaction.begin()
+        CATransaction.setCompletionBlock(completion)
+        self.pushViewController(viewController, animated: animated)
+        CATransaction.commit()
+    }
+
+}
diff --git a/DuckDuckGoTests/MockSecureVault.swift b/DuckDuckGoTests/MockSecureVault.swift
index 5b089a6d44..213619b999 100644
--- a/DuckDuckGoTests/MockSecureVault.swift
+++ b/DuckDuckGoTests/MockSecureVault.swift
@@ -42,6 +42,7 @@ final class MockSecureVault<T: AutofillDatabaseProvider>: AutofillSecureVault {
 
     var storedAccounts: [SecureVaultModels.WebsiteAccount] = []
     var storedCredentials: [Int64: SecureVaultModels.WebsiteCredentials] = [:]
+    var storedCredentialsForDomain: [String: [SecureVaultModels.WebsiteCredentials]] = [:]
     var storedNeverPromptWebsites = [SecureVaultModels.NeverPromptWebsites]()
     var storedNotes: [SecureVaultModels.Note] = []
     var storedIdentities: [SecureVaultModels.Identity] = []
@@ -100,6 +101,14 @@ final class MockSecureVault<T: AutofillDatabaseProvider>: AutofillSecureVault {
         return storedCredentials[accountId]
     }
 
+    func websiteCredentialsFor(domain: String) throws -> [BrowserServicesKit.SecureVaultModels.WebsiteCredentials] {
+        return storedCredentialsForDomain[domain] ?? []
+    }
+
+    func websiteCredentialsWithPartialMatchesFor(eTLDplus1: String) throws -> [BrowserServicesKit.SecureVaultModels.WebsiteCredentials] {
+        return storedCredentialsForDomain[eTLDplus1] ?? []
+    }
+
     func storeWebsiteCredentials(_ credentials: SecureVaultModels.WebsiteCredentials) throws -> Int64 {
         let accountID = Int64(credentials.account.id!)!
         storedCredentials[accountID] = credentials
@@ -264,6 +273,7 @@ class MockDatabaseProvider: AutofillDatabaseProvider {
     var _creditCards = [Int64: SecureVaultModels.CreditCard]()
     var _forDomain = [String]()
     var _credentialsDict = [Int64: SecureVaultModels.WebsiteCredentials]()
+    var _credentialsForDomain = [String: [SecureVaultModels.WebsiteCredentials]]()
     var _note: SecureVaultModels.Note?
     var _neverPromptWebsites = [SecureVaultModels.NeverPromptWebsites]()
 
@@ -293,6 +303,14 @@ class MockDatabaseProvider: AutofillDatabaseProvider {
         return _credentialsDict[accountId]
     }
 
+    func websiteCredentialsForDomain(_ domain: String) throws -> [BrowserServicesKit.SecureVaultModels.WebsiteCredentials] {
+        return _credentialsForDomain[domain] ?? []
+    }
+
+    func websiteCredentialsForTopLevelDomain(_ domain: String) throws -> [BrowserServicesKit.SecureVaultModels.WebsiteCredentials] {
+        return _credentialsForDomain[domain] ?? []
+    }
+
     func websiteAccountsForDomain(_ domain: String) throws -> [SecureVaultModels.WebsiteAccount] {
         self._forDomain.append(domain)
         return _accounts
diff --git a/DuckDuckGoTests/NewTabPageMessagesModelTests.swift b/DuckDuckGoTests/NewTabPageMessagesModelTests.swift
index f35d848f6a..a37e7a0984 100644
--- a/DuckDuckGoTests/NewTabPageMessagesModelTests.swift
+++ b/DuckDuckGoTests/NewTabPageMessagesModelTests.swift
@@ -252,7 +252,7 @@ final class NewTabPageMessagesModelTests: XCTestCase {
 
 private class HomePageMessagesConfigurationMock: HomePageMessagesConfiguration {
     var homeMessages: [HomeMessage]
-    
+
     init(homeMessages: [HomeMessage]) {
         self.homeMessages = homeMessages
     }
diff --git a/DuckDuckGoTests/Subscription/PrivacyProDataReporterTests.swift b/DuckDuckGoTests/Subscription/PrivacyProDataReporterTests.swift
new file mode 100644
index 0000000000..f6b6718c4a
--- /dev/null
+++ b/DuckDuckGoTests/Subscription/PrivacyProDataReporterTests.swift
@@ -0,0 +1,232 @@
+//
+//  PrivacyProDataReporterTests.swift
+//  DuckDuckGo
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+@testable import DuckDuckGo
+@testable import Core
+@testable import BrowserServicesKit
+@testable import DDGSync
+@testable import SecureStorage
+
+final class PrivacyProDataReporterTests: XCTestCase {
+    let testConfig = """
+    {
+        "readme": "https://github.com/duckduckgo/privacy-configuration",
+        "version": 1,
+        "features": {
+            "additionalCampaignPixelParams": {
+                "exceptions": [],
+                "state": "enabled",
+                "settings": {
+                    "origins": [
+                      "test_origin"
+                    ]
+                },
+                "minSupportedVersion": 52080000,
+                "hash": "12345"
+            }
+        }
+    }
+    """.data(using: .utf8)!
+    lazy var configManager = PrivacyConfigurationManager(fetchedETag: nil,
+                                                         fetchedData: nil,
+                                                         embeddedDataProvider: MockEmbeddedDataProvider(data: testConfig, etag: "etag"),
+                                                         localProtection: MockDomainsProtectionStore(),
+                                                         internalUserDecider: DefaultInternalUserDecider())
+
+    let testSuiteName = "PrivacyProDataReporterTests"
+    var testDefaults: UserDefaults!
+    let mockCalendar = MockCalendar()
+    lazy var statisticsStore = StatisticsUserDefaults(groupName: testSuiteName)
+
+    var reporter: PrivacyProDataReporter!
+    var anotherReporter: PrivacyProDataReporter!
+
+    override func setUp() {
+        super.setUp()
+        testDefaults = UserDefaults(suiteName: testSuiteName)
+        reporter = PrivacyProDataReporter(
+            configurationManager: configManager,
+            variantManager: MockVariantManager(currentVariant: VariantIOS(name: "sc", weight: 0, isIncluded: VariantIOS.When.always, features: [])),
+            userDefaults: testDefaults,
+            emailManager: EmailManager(storage: MockEmailStorage.mock),
+            tutorialSettings: MockTutorialSettings(hasSeenOnboarding: false),
+            appSettings: AppSettingsMock(),
+            statisticsStore: statisticsStore,
+            secureVault: nil,
+            tabsModel: TabsModel(tabs: [], desktop: false),
+            dateGenerator: mockCalendar.now
+        )
+        anotherReporter = PrivacyProDataReporter(
+            configurationManager: configManager,
+            variantManager: MockVariantManager(currentVariant: VariantIOS(name: "ru", weight: 0, isIncluded: VariantIOS.When.always, features: [])),
+            userDefaults: testDefaults,
+            emailManager: EmailManager(storage: MockEmailStorage.anotherMock),
+            tutorialSettings: MockTutorialSettings(hasSeenOnboarding: true),
+            appSettings: AppSettingsMock.mockWithWidget,
+            secureVault: nil,
+            tabsModel: TabsModel(tabs: [Tab(), Tab(), Tab(), Tab()], desktop: false)
+        )
+    }
+
+    override func tearDown() {
+        testDefaults.removePersistentDomain(forName: testSuiteName)
+        super.tearDown()
+    }
+
+    func testIsReinstall() {
+        XCTAssertFalse(reporter.isReinstall())
+        XCTAssertTrue(anotherReporter.isReinstall())
+    }
+
+    func testIsFireButtonUser() {
+        for _ in 1...6 {
+            XCTAssertFalse(reporter.isFireButtonUser())
+            reporter.saveFireCount()
+        }
+        XCTAssertTrue(reporter.isFireButtonUser())
+    }
+
+    func testIsAppOnboardingCompleted() {
+        XCTAssertFalse(reporter.isAppOnboardingCompleted())
+        XCTAssertTrue(anotherReporter.isAppOnboardingCompleted())
+    }
+
+    func testIsEmailEnabled() {
+        XCTAssertTrue(reporter.isEmailEnabled())
+        XCTAssertFalse(anotherReporter.isEmailEnabled())
+    }
+
+    func testIsWidgetAdded() async {
+        await reporter.saveWidgetAdded()
+        XCTAssertFalse(reporter.isWidgetAdded())
+        await anotherReporter.saveWidgetAdded()
+        XCTAssertTrue(anotherReporter.isWidgetAdded())
+    }
+
+    func testIsFrequentUser() {
+        XCTAssertFalse(reporter.isFrequentUser())
+
+        reporter.saveApplicationLastSessionEnded()
+        mockCalendar.advance(by: .day, value: 1)
+        XCTAssertTrue(reporter.isFrequentUser())
+
+        reporter.saveApplicationLastSessionEnded()
+        mockCalendar.advance(by: .weekOfMonth, value: 2)
+        XCTAssertFalse(reporter.isFrequentUser())
+    }
+
+    func testIsLongTermUser() {
+        statisticsStore.installDate = mockCalendar.now()
+        XCTAssertFalse(reporter.isLongTermUser())
+
+        mockCalendar.advance(by: .day, value: 15)
+        XCTAssertFalse(reporter.isLongTermUser())
+
+        mockCalendar.advance(by: .day, value: 33)
+        XCTAssertTrue(reporter.isLongTermUser())
+    }
+
+    func testIsValidOpenTabsCount() {
+        XCTAssertFalse(reporter.isValidOpenTabsCount())
+        XCTAssertTrue(anotherReporter.isValidOpenTabsCount())
+    }
+
+    func testIsSearchUser() {
+        for _ in 1...51 {
+            XCTAssertFalse(reporter.isSearchUser())
+            reporter.saveSearchCount()
+        }
+        XCTAssertTrue(reporter.isSearchUser())
+    }
+
+    func testAttachedParameters() {
+        XCTAssertEqual(reporter.randomizedParameters(for: .messageID("some_id")).count, 0)
+        XCTAssertEqual(reporter.randomizedParameters(for: .origin("some_origin")).count, 0)
+        for _ in 0...50 {
+            let params = reporter.randomizedParameters(for: .messageID("test_origin"))
+            XCTAssertLessThanOrEqual(params.count, 8)
+            XCTAssertGreaterThanOrEqual(params.count, 7)
+        }
+        for _ in 0...50 {
+            let params = reporter.randomizedParameters(for: .origin("test_origin"))
+            XCTAssertLessThanOrEqual(params.count, 8)
+            XCTAssertGreaterThanOrEqual(params.count, 7)
+        }
+    }
+}
+
+struct MockTutorialSettings: TutorialSettings {
+    var lastVersionSeen: Int { 0 }
+    var hasSeenOnboarding: Bool
+
+    init(hasSeenOnboarding: Bool) {
+        self.hasSeenOnboarding = hasSeenOnboarding
+    }
+}
+
+class MockEmailStorage: EmailManagerStorage {
+    private let username: String?
+    private let token: String?
+
+    init(username: String?, token: String?) {
+        self.username = username
+        self.token = token
+    }
+
+    static let mock = MockEmailStorage(username: "player1", token: "letmein")
+    static let anotherMock = MockEmailStorage(username: nil, token: nil)
+
+    func getUsername() throws -> String? { username }
+    func getToken() throws -> String? { token }
+    func getAlias() throws -> String? { nil }
+    func getCohort() throws -> String? { nil }
+    func getLastUseDate() throws -> String? { nil }
+    func store(token: String, username: String, cohort: String?) throws {}
+    func store(alias: String) throws {}
+    func store(lastUseDate: String) throws {}
+    func deleteAlias() throws {}
+    func deleteAuthenticationState() throws {}
+    func deleteWaitlistState() throws {}
+}
+
+extension AppSettingsMock {
+    static var mockWithWidget: AppSettingsMock {
+        let mock = AppSettingsMock()
+        mock.widgetInstalled = true
+        return mock
+    }
+}
+
+class MockCalendar {
+    private var date: Date
+    private let calendar = Calendar.current
+
+    init(date: Date = .init(timeIntervalSince1970: 123456)) {
+        self.date = date
+    }
+
+    func advance(by component: Calendar.Component, value: Int) {
+        date = calendar.date(byAdding: component, value: value, to: now())!
+    }
+
+    func now() -> Date {
+        date
+    }
+}
diff --git a/DuckDuckGoTests/YoutublePlayerNavigationHandlerTests.swift b/DuckDuckGoTests/YoutublePlayerNavigationHandlerTests.swift
index 877980dc8e..8fbdc48685 100644
--- a/DuckDuckGoTests/YoutublePlayerNavigationHandlerTests.swift
+++ b/DuckDuckGoTests/YoutublePlayerNavigationHandlerTests.swift
@@ -32,6 +32,8 @@ class DuckPlayerNavigationHandlerTests: XCTestCase {
     var mockNavigationDelegate: MockWKNavigationDelegate!
     var mockAppSettings: AppSettingsMock!
     var mockPrivacyConfig: PrivacyConfigurationManagerMock!
+    var playerSettings: MockDuckPlayerSettings!
+    var player: MockDuckPlayer!
     
     override func setUp() {
         super.setUp()
@@ -92,226 +94,227 @@ class DuckPlayerNavigationHandlerTests: XCTestCase {
         XCTAssertEqual(html, expectedHtml)
     }
     
-    // MARK: handleURLChange tests
+    
+   // MARK: - Decide policyFor Tests
+    
     @MainActor
-    func testHandleURLChangeDuckPlayerEnabled() {
-        let youtubeURL = URL(string: "https://www.youtube.com/watch?v=abc123&t=10s")!
+    func testDecidePolicyForVideoWasAlreadyHandled() {
         
+        let youtubeURL = URL(string: "https://www.youtube.com/watch?v=abc123&t=10s")!
+        let navigationAction = MockNavigationAction(request: URLRequest(url: youtubeURL))
+        let expectation = self.expectation(description: "Completion handler called")
         let playerSettings = MockDuckPlayerSettings(appSettings: mockAppSettings, privacyConfigManager: mockPrivacyConfig)
-        playerSettings.setMode(.enabled)
         let player = MockDuckPlayer(settings: playerSettings)
         let handler = DuckPlayerNavigationHandler(duckPlayer: player)
+        var navigationPolicy: WKNavigationActionPolicy?
         
-        handler.handleURLChange(url: youtubeURL, webView: mockWebView)
+        handler.lastHandledVideoID = "abc123"
         
-        XCTAssertNotNil(mockWebView.lastLoadedRequest, "Expected a new request to be loaded")
+        handler.handleDecidePolicyFor(navigationAction, completion: { policy in
+            navigationPolicy = policy
+            expectation.fulfill()
+        }, webView: mockWebView)
         
-        if let loadedRequest = mockWebView.lastLoadedRequest {
-            XCTAssertEqual(loadedRequest.url?.scheme, "duck")
-            XCTAssertEqual(loadedRequest.url?.host, "player")
-            XCTAssertEqual(loadedRequest.url?.path, "/abc123")
-            XCTAssertEqual(loadedRequest.url?.query?.contains("t=10s"), true)
-        }
+        waitForExpectations(timeout: 1, handler: nil)
         
+        XCTAssertEqual(navigationPolicy, .cancel, "Expected navigation policy to be .cancel")
+
     }
     
     @MainActor
-    func testHandleURLChangeDuckPlayerDisabled() {
-        let youtubeURL = URL(string: "https://www.youtube.com/watch?v=abc123&t=10s")!
+    func testDecidePolicyForVideosThatShouldLoadInYoutube() {
         
+        let youtubeURL = URL(string: "https://www.youtube.com/watch?v=abc123&t=10s&embeds_referring_euri=somevalue")!
+        let navigationAction = MockNavigationAction(request: URLRequest(url: youtubeURL))
+        let expectation = self.expectation(description: "Completion handler called")
         let playerSettings = MockDuckPlayerSettings(appSettings: mockAppSettings, privacyConfigManager: mockPrivacyConfig)
-        playerSettings.setMode(.disabled)
         let player = MockDuckPlayer(settings: playerSettings)
         let handler = DuckPlayerNavigationHandler(duckPlayer: player)
+        var navigationPolicy: WKNavigationActionPolicy?
         
-        handler.handleURLChange(url: youtubeURL, webView: mockWebView)
+        handler.handleDecidePolicyFor(navigationAction, completion: { policy in
+            navigationPolicy = policy
+            expectation.fulfill()
+        }, webView: mockWebView)
         
-        XCTAssertNil(mockWebView.lastLoadedRequest, "Expected a new request NOT to be loaded")
+        waitForExpectations(timeout: 1, handler: nil)
         
+        XCTAssertEqual(navigationPolicy, .allow, "Expected navigation policy to be .allow")
+
     }
     
     @MainActor
-    func testHandleURLChangeDuckPlayerTemporarilyDisabled() {
-        let youtubeURL = URL(string: "https://www.youtube.com/watch?v=abc123&t=10s")!
+    func testDecidePolicyForVideosThatShouldLoadInDuckPlayer() {
         
+        let youtubeURL = URL(string: "https://www.youtube.com/watch?v=abc123&t=10s")!
+        let navigationAction = MockNavigationAction(request: URLRequest(url: youtubeURL))
+        let expectation = self.expectation(description: "Completion handler called")
         let playerSettings = MockDuckPlayerSettings(appSettings: mockAppSettings, privacyConfigManager: mockPrivacyConfig)
-        playerSettings.setMode(.enabled)
+        playerSettings.mode = .enabled
         let player = MockDuckPlayer(settings: playerSettings)
         let handler = DuckPlayerNavigationHandler(duckPlayer: player)
+        var navigationPolicy: WKNavigationActionPolicy?
         
-        handler.isDuckPlayerTemporarilyDisabled = true
-        
-        handler.handleURLChange(url: youtubeURL, webView: mockWebView)
+        handler.handleDecidePolicyFor(navigationAction, completion: { policy in
+            navigationPolicy = policy
+            expectation.fulfill()
+        }, webView: mockWebView)
         
-        XCTAssertNotNil(mockWebView.lastLoadedRequest, "Expected a new request to be loaded")
+        waitForExpectations(timeout: 1, handler: nil)
         
-        if let loadedRequest = mockWebView.lastLoadedRequest {
-            XCTAssertEqual(loadedRequest.url?.scheme, "https")
-            XCTAssertEqual(loadedRequest.url?.host, "m.youtube.com")
-            XCTAssertEqual(loadedRequest.url?.path, "/watch")
-            XCTAssertEqual(loadedRequest.url?.query?.contains("v=abc123"), true)
-            XCTAssertEqual(loadedRequest.url?.query?.contains("t=10s"), true)
-        }
+        XCTAssertEqual(navigationPolicy, .cancel, "Expected navigation policy to be .cancel")
+
     }
     
     @MainActor
-    func testHandleURLChangeNonYouTubeURL() {
-        let nonYouTubeURL = URL(string: "https://www.google.com")!
+    func testDecidePolicyForOtherURLThatShouldLoadNormally() {
         
+        let youtubeURL = URL(string: "https://www.google.com/")!
+        let navigationAction = MockNavigationAction(request: URLRequest(url: youtubeURL))
+        let expectation = self.expectation(description: "Completion handler called")
         let playerSettings = MockDuckPlayerSettings(appSettings: mockAppSettings, privacyConfigManager: mockPrivacyConfig)
-        playerSettings.setMode(.enabled)
+        playerSettings.mode = .enabled
         let player = MockDuckPlayer(settings: playerSettings)
         let handler = DuckPlayerNavigationHandler(duckPlayer: player)
+        var navigationPolicy: WKNavigationActionPolicy?
+        
+        handler.handleDecidePolicyFor(navigationAction, completion: { policy in
+            navigationPolicy = policy
+            expectation.fulfill()
+        }, webView: mockWebView)
         
-        handler.handleURLChange(url: nonYouTubeURL, webView: mockWebView)
+        waitForExpectations(timeout: 1, handler: nil)
         
-        XCTAssertNil(mockWebView.lastLoadedRequest, "Expected a new request NOT to be loaded")
+        XCTAssertEqual(navigationPolicy, .allow, "Expected navigation policy to be .allow")
+
     }
     
+    // MARK: - HandleJS Navigation Tests
+    
     @MainActor
-    func testHandleNavigationOpenInYoutubeLink() {
-        let duckURL = URL(string: "duck://player/openInYoutube?v=12345")!
-        let navigationAction = MockNavigationAction(request: URLRequest(url: duckURL))
-        
+    func testJSNavigationForVideoWasAlreadyHandled() {
+     
+        let url: URL = URL(string: "https://www.example.com/")!
+        webView.load(URLRequest(url: url))
+        let youtubeURL = URL(string: "https://www.youtube.com/watch?v=abc123&t=10s")!
+       
         let playerSettings = MockDuckPlayerSettings(appSettings: mockAppSettings, privacyConfigManager: mockPrivacyConfig)
-        playerSettings.setMode(.enabled)
         let player = MockDuckPlayer(settings: playerSettings)
         let handler = DuckPlayerNavigationHandler(duckPlayer: player)
         
-        handler.handleNavigation(navigationAction, webView: mockWebView)
+        handler.lastHandledVideoID = "abc123"
+        handler.handleJSNavigation(url: youtubeURL, webView: webView)
         
-        XCTAssertTrue(handler.isDuckPlayerTemporarilyDisabled, "Expected DuckPlayer to be temporarily disabled")
-        XCTAssertNotNil(mockWebView.lastLoadedRequest, "Expected a new request to be loaded")
-        
-        if let loadedRequest = mockWebView.lastLoadedRequest {
-            XCTAssertEqual(loadedRequest.url?.scheme, "https")
-            XCTAssertEqual(loadedRequest.url?.host, "m.youtube.com")
-            XCTAssertEqual(loadedRequest.url?.path, "/watch")
-            XCTAssertEqual(loadedRequest.url?.query?.contains("v=12345"), true)
-        }
+        XCTAssertEqual(webView.url?.absoluteString, url.absoluteString)
     }
     
     @MainActor
-    func testHandleNavigationDuckPlayerEnabledAlreadyInDuckPlayer() {
-        let duckPlayerURL = URL(string: "duck://player/CYTASDSD")!
+    func testJSNavigationForVideoThatShouldLoadInYoutube() {
         
-        let navigationAction = MockNavigationAction(request: URLRequest(url: duckPlayerURL))
+        let url: URL = URL(string: "https://www.example.com/")!
+        webView.load(URLRequest(url: url))
+        let youtubeURL = URL(string: "https://www.youtube.com/watch?v=abc123&t=10s&embeds_referring_euri=somevalue")!
+       
         let playerSettings = MockDuckPlayerSettings(appSettings: mockAppSettings, privacyConfigManager: mockPrivacyConfig)
         let player = MockDuckPlayer(settings: playerSettings)
-        player.settings.setMode(.enabled)
-        
         let handler = DuckPlayerNavigationHandler(duckPlayer: player)
-        handler.handleNavigation(navigationAction, webView: mockWebView)
-        
-        XCTAssertNil(mockWebView.lastLoadedRequest, "Expected a new request to be loaded")
+                
+        handler.handleJSNavigation(url: youtubeURL, webView: webView)
         
+        XCTAssertEqual(webView.url?.absoluteString, url.absoluteString)
     }
     
-    
     @MainActor
-    func testHandleNavigationDuckPlayerDisabled() {
-        let duckPlayerURL = URL(string: "duck://player/CUIUIIUI")!
+    func testJSNavigationForVideoThatShouldLoadInDuckPlayer() {
         
-        let navigationAction = MockNavigationAction(request: URLRequest(url: duckPlayerURL))
+        let url: URL = URL(string: "https://www.example.com/")!
+        webView.load(URLRequest(url: url))
+        let youtubeURL = URL(string: "https://www.youtube.com/watch?v=abc123&t=10s")!
         let playerSettings = MockDuckPlayerSettings(appSettings: mockAppSettings, privacyConfigManager: mockPrivacyConfig)
-        playerSettings.setMode(.disabled)
+        playerSettings.mode = .enabled
         let player = MockDuckPlayer(settings: playerSettings)
         let handler = DuckPlayerNavigationHandler(duckPlayer: player)
                 
-        handler.handleNavigation(navigationAction, webView: mockWebView)
-        
-        XCTAssertNil(mockWebView.lastLoadedRequest, "Expected a new request to be loaded")
+        handler.handleJSNavigation(url: youtubeURL, webView: webView)
         
+        XCTAssertEqual(webView.url?.absoluteString, "duck://player/abc123?t=10s")
     }
     
+    // MARK: Handle Navigation Tests
+    
     @MainActor
-    func testHandleDecidePolicyForVideoJustHandled() {
-        let youtubeURL = URL(string: "https://www.youtube.com/watch?v=abc123&t=10s")!
+    func testAgeRestrictedVideoShouldNotBeHandled() {
+        
+        let youtubeURL = URL(string: "https://www.youtube.com/watch?v=abc123&t=10s&embeds_referring_euri=somevalue")!
         let navigationAction = MockNavigationAction(request: URLRequest(url: youtubeURL))
         let playerSettings = MockDuckPlayerSettings(appSettings: mockAppSettings, privacyConfigManager: mockPrivacyConfig)
-        playerSettings.setMode(.enabled)
+        playerSettings.mode = .enabled
         let player = MockDuckPlayer(settings: playerSettings)
         let handler = DuckPlayerNavigationHandler(duckPlayer: player)
         
-        // Call handleDecidePolicyFor twice with the same URL to simulate handling the same video twice
-        handler.handleDecidePolicyFor(navigationAction, webView: mockWebView)
-        
-        // Wait for 0.8 seconds to simulate the time delay
-        let expectation = self.expectation(description: "Wait for 0.8 seconds")
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.8) {
-            handler.handleDecidePolicyFor(navigationAction, webView: self.mockWebView)
-            expectation.fulfill()
-        }
-        
-        waitForExpectations(timeout: 1.0, handler: nil)
+        handler.handleNavigation(navigationAction, webView: webView)
+        XCTAssertEqual(webView.url, nil)
         
-        // Verify that the second call did not load a new request
-        XCTAssertNil(mockWebView.lastLoadedRequest, "Expected no new request to be loaded since video was just handled")
     }
     
     @MainActor
-    func testHandleDecidePolicyForTransformYoutubeURL() {
+    func testHandleNavigationLoadsDuckPlayer() {
         
-        let youtubeURL = URL(string: "https://m.youtube.com/watch?v=abc123&t=10s")!
-        let navigationAction = MockNavigationAction(request: URLRequest(url: youtubeURL))
+        let link = URL(string: "duck://player/12345")!
+        let navigationAction = MockNavigationAction(request: URLRequest(url: link))
         let playerSettings = MockDuckPlayerSettings(appSettings: mockAppSettings, privacyConfigManager: mockPrivacyConfig)
-        playerSettings.setMode(.enabled)
+        playerSettings.mode = .enabled
         let player = MockDuckPlayer(settings: playerSettings)
         let handler = DuckPlayerNavigationHandler(duckPlayer: player)
         
-        handler.handleDecidePolicyFor(navigationAction, webView: mockWebView)
+        handler.handleNavigation(navigationAction, webView: webView)
+                
+        let expectation = self.expectation(description: "Simulated Request Expectation")
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+            
+            XCTAssertEqual(self.webView.url?.absoluteString, "https://www.youtube-nocookie.com/embed/12345")
+            expectation.fulfill()
+        }
         
-        XCTAssertNil(mockWebView.lastLoadedRequest, "Expected a new request to be loaded")
-     
+        waitForExpectations(timeout: 1.0, handler: nil)
+    
     }
     
     @MainActor
-    func testHandleReloadForDuckPlayerVideoWithDuckPlayerDisabled() {
+    func testHandleReloadForDuckPlayerVideo() {
         let duckPlayerURL = URL(string: "https://www.youtube-nocookie.com/embed/abc123?t=10s")!
                 
-        mockWebView.setCurrentURL(duckPlayerURL)
-        
         let playerSettings = MockDuckPlayerSettings(appSettings: mockAppSettings, privacyConfigManager: mockPrivacyConfig)
-        playerSettings.setMode(.disabled)
+        playerSettings.mode = .enabled
         let player = MockDuckPlayer(settings: playerSettings)
         let handler = DuckPlayerNavigationHandler(duckPlayer: player)
-
         handler.handleReload(webView: mockWebView)
         
-        XCTAssertNil(mockWebView.lastLoadedRequest, "Expected a new request not to be loaded")
-        
+        if let loadedRequest = mockWebView.lastLoadedRequest {
+            XCTAssertEqual(loadedRequest.url?.scheme, "duck")
+            XCTAssertEqual(loadedRequest.url?.host, "player")
+            XCTAssertEqual(loadedRequest.url?.path, "/abc123")
+            XCTAssertEqual(loadedRequest.url?.query?.contains("t=10s"), true)
+        }
     }
     
     @MainActor
-    func testHandleReloadForNonDuckPlayerVideoWithDuckPlayerEnabled() {
-        let nonDuckPlayerURL = URL(string: "https://www.google.com")!
-        
-        // Simulate the current URL
-        mockWebView.setCurrentURL(nonDuckPlayerURL)
-        
+    func testAttach() {
+        let duckPlayerURL = URL(string: "https://www.youtube-nocookie.com/embed/abc123?t=10s")!
+                
         let playerSettings = MockDuckPlayerSettings(appSettings: mockAppSettings, privacyConfigManager: mockPrivacyConfig)
-        playerSettings.setMode(.alwaysAsk)
+        playerSettings.mode = .enabled
         let player = MockDuckPlayer(settings: playerSettings)
         let handler = DuckPlayerNavigationHandler(duckPlayer: player)
-
-        handler.handleReload(webView: mockWebView)
-        XCTAssertNil(mockWebView.lastLoadedRequest, "Expected a new request not to be loaded")
-    }
-    
-    @MainActor
-    func testHandleReloadForNonDuckPlayerVideoWithDuckPlayerDisabled() {
-        let nonDuckPlayerURL = URL(string: "https://www.google.com")!
+        handler.handleAttach(webView: mockWebView)
         
-        // Simulate the current URL
-        mockWebView.setCurrentURL(nonDuckPlayerURL)
-        
-        let playerSettings = MockDuckPlayerSettings(appSettings: mockAppSettings, privacyConfigManager: mockPrivacyConfig)
-        playerSettings.setMode(.disabled)
-        let player = MockDuckPlayer(settings: playerSettings)
-        let handler = DuckPlayerNavigationHandler(duckPlayer: player)
-
-        handler.handleReload(webView: mockWebView)
-        XCTAssertNil(mockWebView.lastLoadedRequest, "Expected a new request not to be loaded")
+        if let loadedRequest = mockWebView.lastLoadedRequest {
+            XCTAssertEqual(loadedRequest.url?.scheme, "duck")
+            XCTAssertEqual(loadedRequest.url?.host, "player")
+            XCTAssertEqual(loadedRequest.url?.path, "/abc123")
+            XCTAssertEqual(loadedRequest.url?.query?.contains("t=10s"), true)
+        }
     }
+    
 
 }