diff --git a/js/script.js b/js/script.js
index 09cd7bc..a9da2bc 100644
--- a/js/script.js
+++ b/js/script.js
@@ -99,7 +99,7 @@ $(document)
         $('#demo-result').get(0).scrollIntoView();
         updateDemo(UAParser(qs));
     } else {
-        UAParser().withClientHints().then(function(result) {
+        (UAParser().withFeatureCheck()).withClientHints().then(function(result) {
             updateDemo(result);
         });
     }
diff --git a/test/index.html b/test/index.html
index b235293..79ddb46 100644
--- a/test/index.html
+++ b/test/index.html
@@ -1,9 +1,30 @@
 <script src="../js/ua-parser.js"></script>
 <script>
     try {
-        var result = JSON.stringify(UAParser(), null, "\t");
-        document.write("<pre>" + result + "</pre>");
-        console.log(result);
+        UAParser().withClientHints().then(function (result) {
+            var uap = JSON.stringify(result.withFeatureCheck(), null, "\t");
+            document.write("<p><pre>UAParser.js:\n" + uap + "</pre></p>");
+            console.log('UAParser.js result: ', uap);
+            if (navigator.userAgentData) {
+                navigator.userAgentData
+                    .getHighEntropyValues([
+                        "brands",
+                        "mobile",
+                        "platform",
+                        "architecture",
+                        "bitness",
+                        "formFactors",
+                        "model",
+                        "platformVersion",
+                        "fullVersionList",
+                        "wow64"
+                    ])
+                    .then(function (values) {
+                        document.write("<pre>Client Hints:\n" + JSON.stringify(values, null, "\t") + "</pre>");
+                        console.log('Client Hints result: ', values);
+                    });
+            };
+        });
     } catch (e) {
         document.write("Error: " + e);
     }