diff --git a/build.sh b/build.sh
index a9bee3f..d05445e 100755
--- a/build.sh
+++ b/build.sh
@@ -1,10 +1,10 @@
-#!/bin/bash
-
-mkdir -p build; rm -rf build/*
-mkdir -p dist; rm -rf dist/*
-cp -r src build/firefox
-cp -r src build/chrome
-node mixin.js firefox/manifest.json build/firefox/manifest.json
-cd build/chrome; zip -r ../../dist/chrome.zip *; cd ../..
-cd build/firefox; zip -r ../../dist/firefox.xpi *; cd ../..
+#!/bin/bash
+
+mkdir -p build; rm -rf build/*
+mkdir -p dist; rm -rf dist/*
+cp -r src build/firefox
+cp -r src build/chrome
+node mixin.js firefox/manifest.json build/firefox/manifest.json
+cd build/chrome; zip -r ../../dist/chrome.zip *; cd ../..
+cd build/firefox; zip -r ../../dist/firefox.xpi *; cd ../..
 rm -rf build
\ No newline at end of file
diff --git a/src/manifest.json b/src/manifest.json
index 6ac1f69..7e7df09 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "__MSG_extensionName__",
   "description": "__MSG_extensionDescription__",
-  "version": "3.3.7",
+  "version": "3.4.0",
   "homepage_url": "https://tosdr.org",
   "background": {
     "scripts": [
diff --git a/src/popup/js/popup.js b/src/popup/js/popup.js
index b555ddb..3854239 100644
--- a/src/popup/js/popup.js
+++ b/src/popup/js/popup.js
@@ -1,135 +1,153 @@
-/* global window, $, jQuery, getLiveServiceDetails, getRatingText,
-getTweetText, browser, FALLBACK_SHIELDS, log */
-/* eslint-disable indent */
-
-function escapeHTML(unsafe) {
-    return (`${unsafe}`)
-        .replace(/&(?!amp;)/g, '&')
-        .replace(/<(?!lt;)/g, '&lt;')
-        .replace(/>(?!gt;)/g, '&gt;')
-        .replace(/"(?!quot;)/g, '&quot;')
-        .replace(/'(?!#039;)/g, '&#039;');
-}
-
-jQuery(() => {
-    function tosdrPoint(service, dataPoint) {
-        let badge;
-        let icon;
-        // let sign;
-        if (dataPoint) {
-            if (dataPoint.tosdr.point === 'good') {
-                badge = 'badge-success';
-                icon = 'thumbs-up';
-                // sign = '+';
-            } else if (dataPoint.tosdr.point === 'bad') {
-                badge = 'badge-warning';
-                icon = 'thumbs-down';
-                // sign = '-';
-            } else if (dataPoint.tosdr.point === 'blocker') {
-                badge = 'badge-important';
-                icon = 'times';
-                // sign = '×';
-            } else if (dataPoint.tosdr.point === 'neutral') {
-                badge = 'badge-secondary';
-                icon = 'asterisk';
-                // sign = '→';
-            } else {
-                badge = '';
-                icon = 'question';
-                // sign = '?';
-            }
-            const pointText = dataPoint.description || '';
-
-            // Extract links from text
-            const taggedText = pointText.split(/(<\/?\w+(?:(?:\s+\w+(?:\s*=\s*(?:".*?"|'.*?'|[^'">\s]+))?)+\s*|\s*)\/?>)/gim);
-            $(`#popup-point-${service.id}-${dataPoint.id}`)
-                .append($('<div>', { class: dataPoint.point })
-                    .append($('<h5>')
-                        .append($('<span>', { class: `badge ${badge}`, title: escapeHTML(dataPoint.tosdr.point) })
-                            .append($('<li>', { class: `fas fa-${icon}` })))
-                        .append($('<a>', {
-                            href: escapeHTML(dataPoint.discussion), target: '_blank', class: 'ml-2', text: dataPoint.title,
-                        }))));
-
-            $(`#popup-point-${service.id}-${dataPoint.id}`).append($('<p>'));
-            if (taggedText.length > 1) {
-                taggedText.forEach((t) => {
-                    $(`#popup-point-${service.id}-${dataPoint.id} p`).append(t);
-                });
-            } else {
-                $(`#popup-point-${service.id}-${dataPoint.id} p`).text(pointText);
-            }
-        }
-    }
-    const serviceUrl = window.location.hash.substr(1);
-    function updatePopup() {
-        $('.loading').show();
-        getLiveServiceDetails(serviceUrl).then((service) => {
-            log('service', service);
-            browser.storage.local.get('settings').then((items) => {
-                $('#service_url').attr('href', `https://tosdr.org/en/service/${service.id}`);
-                $('#service_class').addClass(service.class);
-                if (service.class !== false) {
-                    $('#service_class').text(`Grade ${service.class}`);
-                    $('#ratingText').text(getRatingText(service.class));
-                } else {
-                    $('#service_class').text('No Grade Yet');
-                    $('#service_class').remove();
-                    $('#ratingText').text(getRatingText(service.class));
-                }
-
-                // Points
-                service.points.forEach((p) => {
-                    $('.tosdr-points').append($('<li>', { id: `popup-point-${service.id}-${p}`, class: 'point' }));
-                    tosdrPoint(service, service.pointsData[p]);
-                });
-
-                // links inside of the dataPoints should open in a new window
-                $('.tosdr-points a').attr('target', '_blank');
-
-                if (!items.settings.hideshields) {
-                    $('#shieldimg').attr('src', `${(typeof items.settings === 'undefined' ? FALLBACK_SHIELDS : items.settings.shield_endpoint)}/${service.id}.svg`);
-                    $('#shieldurl').val(`${(typeof items.settings === 'undefined' ? FALLBACK_SHIELDS : items.settings.shield_endpoint)}${service.id}.svg`);
-                    $('#privacyshield').show();
-                }
-                if (items.settings.curator) {
-                    $('#edit_url').attr('href', `https://edit.tosdr.org/services/${service.id}/edit`);
-                    $('#add_document_url').attr('href', `https://edit.tosdr.org/documents/new?service=${service.id}`);
-                    $('[data-visiblity="curator"]').show();
-                }
-                $('#serviceimg').attr('src', service.image).addClass('float-right');
-                if (getTweetText(service) !== false) {
-                    $('#twitter_url').attr('href', encodeURI(`https://twitter.com/intent/tweet?text=${getTweetText(service)}&via=ToSDR&hashtags=ToS`));
-                } else {
-                    $('#twitter_url').remove();
-                }
-
-                if (Object.keys(service.links).length > 0) {
-                    $('#linksList')
-                        .append($('<h4>', { text: 'Read the Terms' }))
-                        .append($('<ul>', { class: 'tosback2' }));
-
-                    Object.keys(service.links).forEach((d) => {
-                        $('.tosback2').append($('<li>')
-                            .append($('<a>', { href: escapeHTML(service.links[d].url), target: '_blank', text: service.links[d].name })));
-                    });
-                }
-                // [x] Button
-                $('#closeButton,.close').click(() => {
-                    window.close();
-                });
-
-                $('.loading').hide();
-            });
-        }).catch(() => {
-            $('#page').empty();
-            $('#page').append($('<div>', { class: 'modal-body' })
-                .append($('<div>', { class: 'tosdr-rating' })
-                    .append($('<h4>', { text: 'This service is not rated, yet.' }))
-                    .append($('<a>', { text: `Request ${serviceUrl} to be added`, class: 'btn btn-success btn-block', href: 'https://forum.tosdr.org/request' }))));
-            $('.loading').hide();
-        });
-    }
-
-    updatePopup();
-});
+/* global window, $, jQuery, getLiveServiceDetails, getRatingText,
+getTweetText, browser, FALLBACK_SHIELDS, log, compareVersion */
+/* eslint-disable indent */
+
+function escapeHTML(unsafe) {
+    return (`${unsafe}`)
+        .replace(/&(?!amp;)/g, '&amp;')
+        .replace(/<(?!lt;)/g, '&lt;')
+        .replace(/>(?!gt;)/g, '&gt;')
+        .replace(/"(?!quot;)/g, '&quot;')
+        .replace(/'(?!#039;)/g, '&#039;');
+}
+
+jQuery(() => {
+    function tosdrPoint(service, dataPoint) {
+        let badge;
+        let icon;
+        // let sign;
+        if (dataPoint) {
+            if (dataPoint.tosdr.point === 'good') {
+                badge = 'badge-success';
+                icon = 'thumbs-up';
+                // sign = '+';
+            } else if (dataPoint.tosdr.point === 'bad') {
+                badge = 'badge-warning';
+                icon = 'thumbs-down';
+                // sign = '-';
+            } else if (dataPoint.tosdr.point === 'blocker') {
+                badge = 'badge-important';
+                icon = 'times';
+                // sign = '×';
+            } else if (dataPoint.tosdr.point === 'neutral') {
+                badge = 'badge-secondary';
+                icon = 'asterisk';
+                // sign = '→';
+            } else {
+                badge = '';
+                icon = 'question';
+                // sign = '?';
+            }
+            const pointText = dataPoint.description || '';
+
+            // Extract links from text
+            const taggedText = pointText.split(/(<\/?\w+(?:(?:\s+\w+(?:\s*=\s*(?:".*?"|'.*?'|[^'">\s]+))?)+\s*|\s*)\/?>)/gim);
+            $(`#popup-point-${service.id}-${dataPoint.id}`)
+                .append($('<div>', { class: dataPoint.point })
+                    .append($('<h5>')
+                        .append($('<span>', { class: `badge ${badge}`, title: escapeHTML(dataPoint.tosdr.point) })
+                            .append($('<li>', { class: `fas fa-${icon}` })))
+                        .append($('<a>', {
+                            href: escapeHTML(dataPoint.discussion), target: '_blank', class: 'ml-2', text: dataPoint.title,
+                        }))));
+
+            $(`#popup-point-${service.id}-${dataPoint.id}`).append($('<p>'));
+            if (taggedText.length > 1) {
+                taggedText.forEach((t) => {
+                    $(`#popup-point-${service.id}-${dataPoint.id} p`).append(t);
+                });
+            } else {
+                $(`#popup-point-${service.id}-${dataPoint.id} p`).text(pointText);
+            }
+        }
+    }
+    const serviceUrl = window.location.hash.substr(1);
+    function updatePopup() {
+        $('.loading').show();
+        getLiveServiceDetails(serviceUrl).then((service) => {
+            log('service', service);
+            browser.storage.local.get('settings').then((items) => {
+                $('#service_url').attr('href', `https://tosdr.org/en/service/${service.id}`);
+                $('#service_class').addClass(service.class);
+                if (service.class !== false) {
+                    $('#service_class').text(`Grade ${service.class}`);
+                    $('#ratingText').text(getRatingText(service.class));
+                } else {
+                    $('#service_class').text('No Grade Yet');
+                    $('#service_class').remove();
+                    $('#ratingText').text(getRatingText(service.class));
+                }
+
+                // Points
+                service.points.forEach((p) => {
+                    $('.tosdr-points').append($('<li>', { id: `popup-point-${service.id}-${p}`, class: 'point' }));
+                    tosdrPoint(service, service.pointsData[p]);
+                });
+
+                // links inside of the dataPoints should open in a new window
+                $('.tosdr-points a').attr('target', '_blank');
+
+                if (!items.settings.hideshields) {
+                    $('#shieldimg').attr('src', `${(typeof items.settings === 'undefined' ? FALLBACK_SHIELDS : items.settings.shield_endpoint)}/${service.id}.svg`);
+                    $('#shieldurl').val(`${(typeof items.settings === 'undefined' ? FALLBACK_SHIELDS : items.settings.shield_endpoint)}${service.id}.svg`);
+                    $('#privacyshield').show();
+                }
+                if (items.settings.curator) {
+                    $('#edit_url').attr('href', `https://edit.tosdr.org/services/${service.id}/edit`);
+                    $('#add_document_url').attr('href', `https://edit.tosdr.org/documents/new?service=${service.id}`);
+                    $('[data-visiblity="curator"]').show();
+                }
+                $('#serviceimg').attr('src', service.image).addClass('float-right');
+                if (getTweetText(service) !== false) {
+                    $('#twitter_url').attr('href', encodeURI(`https://twitter.com/intent/tweet?text=${getTweetText(service)}&via=ToSDR&hashtags=ToS`));
+                } else {
+                    $('#twitter_url').remove();
+                }
+
+                if (Object.keys(service.links).length > 0) {
+                    $('#linksList')
+                        .append($('<h4>', { text: 'Read the Terms' }))
+                        .append($('<ul>', { class: 'tosback2' }));
+
+                    Object.keys(service.links).forEach((d) => {
+                        $('.tosback2').append($('<li>')
+                            .append($('<a>', { href: escapeHTML(service.links[d].url), target: '_blank', text: service.links[d].name })));
+                    });
+                }
+                // [x] Button
+                $('#closeButton,.close').click(() => {
+                    window.close();
+                });
+
+                $('.loading').hide();
+                if (!items.settings.dontcheckforupdates) {
+                    compareVersion().then((response) => {
+                        if (response.parameters.compare === -1) {
+                            $('#updatecheck').html(`You are running an unreleased version (${response.parameters.given}), bugs may occur.`);
+                            $('#updatecheck').addClass('alert alert-warning');
+                        } else if (response.parameters.compare === 0) {
+                            $('#updatecheck').remove();
+                            $('#updatecheckbottom').html('You are up to date, cool beans!');
+                            $('#updatecheckbottom').addClass('alert alert-success');
+                        } else {
+                            $('#updatecheck').html(`Your version (${response.parameters.given}) is out of date! The Latest version is ${response.parameters.latest}`);
+                            $('#updatecheck').addClass('alert alert-danger');
+                        }
+                    });
+                } else {
+                    $('#updatecheckbottom').remove();
+                    $('#updatecheck').remove();
+                }
+            });
+        }).catch(() => {
+            $('#page').empty();
+            $('#page').append($('<div>', { class: 'modal-body' })
+                .append($('<div>', { class: 'tosdr-rating' })
+                    .append($('<h4>', { text: 'This service is not rated, yet.' }))
+                    .append($('<a>', { text: `Request ${serviceUrl} to be added`, class: 'btn btn-success btn-block', href: 'https://forum.tosdr.org/request' }))));
+            $('.loading').hide();
+        });
+    }
+
+    updatePopup();
+});
diff --git a/src/popup/js/servicedata.js b/src/popup/js/servicedata.js
index 12a3ce3..e2ecf3a 100644
--- a/src/popup/js/servicedata.js
+++ b/src/popup/js/servicedata.js
@@ -1,178 +1,182 @@
-/* globals document, browser: true, fetch, Request, log */
-/* eslint-disable indent, max-len */
-const APPLICABLE_PROTOCOLS = ['http:', 'https:']; // eslint-disable-line no-unused-vars
-const REVIEW_PREFIX = 'tosdr/review/'; // eslint-disable-line no-unused-vars
-const RATING_TEXT = { // eslint-disable-line no-unused-vars
-    D: 'The terms of service are very uneven or there are some important issues that need your attention.',
-    E: 'The terms of service raise very serious concerns.',
-};
-
-const FALLBACK_API = 'https://api.tosdr.org/v1/service/'; // eslint-disable-line no-unused-vars
-const FALLBACK_SHIELDS = 'https://shields.tosdr.org/'; // eslint-disable-line no-unused-vars
-const FALLBACK_UPDATE_API = 'https://api.tosdr.org/updatecheck/';
-const services = []; // eslint-disable-line no-unused-vars
-
-/*
-Returns true only if the URL's protocol is in APPLICABLE_PROTOCOLS.
-*/
-function getDomain(url) {
-    const anchor = document.createElement('a');
-    anchor.href = url;
-    if (APPLICABLE_PROTOCOLS.includes(anchor.protocol)) {
-        if (anchor.hostname.startsWith('www.')) {
-            return anchor.hostname.substr(4);
-        }
-        return anchor.hostname;
-    }
-    return null;
-}
-
-function getRatingText(label) { // eslint-disable-line no-unused-vars
-    let text = String;
-    switch (label) {
-        case 'A':
-            text = 'The terms of service treat you fairly, respect your rights and follows the best practices.';
-            break;
-        case 'B':
-            text = 'The terms of services are fair towards the user but they could be improved.';
-            break;
-        case 'C':
-            text = 'The terms of service are okay but some issues need your consideration.';
-            break;
-        case 'D':
-            text = 'The terms of service are very uneven or there are some important issues that need your attention.';
-            break;
-        case 'E':
-            text = 'The terms of service raise very serious concerns.';
-            break;
-        default:
-            text = 'We haven\'t sufficiently reviewed the terms yet. Please contribute to on Phoenix: edit.tosdr.org';
-    }
-
-    return text;
-}
-
-function getTweetText(service) { // eslint-disable-line no-unused-vars
-    let text = String;
-    switch (service.class) {
-        case 'A':
-            text = `Thank you ${service.name} for caring about my privacy! Grade ${service.class}!`;
-            break;
-        case 'B':
-            text = `Thank you ${service.name} for caring about my privacy! Grade ${service.class} is good but it could be improved!`;
-            break;
-        case 'C':
-            text = `${service.name}, your Grade ${service.class} is not that good, can you comment?`;
-            break;
-        case 'D':
-        case 'E':
-            text = `Your Grade ${service.class} rating worries me ${service.name}, can you comment?`;
-            break;
-        default:
-            return false;
-    }
-
-    return text;
-}
-
-function compareVersion() { // eslint-disable-line no-unused-vars
-    return browser.storage.local.get('settings').then((items) => {
-        const requestURL = `${(typeof items.settings === 'undefined' ? FALLBACK_UPDATE_API : items.settings.update_api_endpoint)}${browser.runtime.getManifest().version}.json`;
-        const driveRequest = new Request(requestURL, {
-            method: 'GET',
-        });
-
-        return fetch(driveRequest).then((response) => {
-            if (response.status === 200) {
-                return response.json();
-            }
-            throw response.status;
-        });
-    });
-}
-
-function getServices() { // eslint-disable-line no-unused-vars
-    return browser.storage.local.get('settings').then((items) => {
-        const requestURL = `${(typeof items.settings === 'undefined' ? FALLBACK_API : items.settings.api_endpoint)}/all.json`;
-        const driveRequest = new Request(requestURL, {
-            method: 'GET',
-        });
-
-        return fetch(driveRequest).then((response) => {
-            if (response.status === 200) {
-                return response.json();
-            }
-            throw response.status;
-        });
-    });
-}
-
-function getDomainEntryFromStorage(domain) {
-    // console.log('getDomainEntryFromStorage', domain)
-    return browser.storage.local.get(REVIEW_PREFIX + domain)
-        .then(resultSet => resultSet[REVIEW_PREFIX + domain] || undefined);
-}
-
-function getLiveServiceDetails(domain, tries = 0) { // eslint-disable-line no-unused-vars
-    // console.log('getServiceDetails', domain, tries)
-    if (!domain) {
-        return Promise.reject(new Error('no domain name provided'));
-    }
-    if (tries > 10) {
-        return Promise.reject(new Error(`too many redirections ${domain}`));
-    }
-
-    return getDomainEntryFromStorage(domain).then(details => browser.storage.local.get('settings').then((items) => {
-        const requestURL = `${(typeof items.settings === 'undefined' ? FALLBACK_API : items.settings.api_endpoint)}/${details.id}.json`;
-        const driveRequest = new Request(requestURL, {
-            method: 'GET',
-        });
-
-        return fetch(driveRequest).then((response) => {
-            if (response.status === 200) {
-                return response.json().then(data => Object.assign({ mainDomain: domain }, data));
-            }
-            throw response.status;
-        });
-    }));
-}
-
-function getServiceDetails(domain, tries = 0) {
-    log('getServiceDetails', domain, tries);
-    if (!domain) {
-        return Promise.reject(new Error('no domain name provided'));
-    }
-    if (tries > 10) {
-        return Promise.reject(new Error(`too many redirections ${domain}`));
-    }
-
-    return getDomainEntryFromStorage(domain).then((details) => {
-        if (!details) {
-            const domainParts = domain.split('.');
-            if (domainParts.length > 2) {
-                log('trying parent domain');
-                return getServiceDetails(domainParts.slice(1).join('.'), tries + 1);
-            }
-            log('details of domain not found', domain);
-            return Promise.reject(new Error('details not found'));
-        }
-        if (details.see) {
-            return getServiceDetails(details.see, tries + 1);
-        }
-        // console.log('mainDomain set', details)
-        return Object.assign({
-            mainDomain: domain,
-        }, details);
-    });
-}
-
-function getService(tab) { // eslint-disable-line no-unused-vars
-    // console.log('getService', tab)
-    const domain = getDomain(tab.url);
-    return getServiceDetails(domain);
-}
-
-function getIconForService(service) { // eslint-disable-line no-unused-vars
-    const imageName = service.rated ? service.rated.toLowerCase() : 'false';
-    return `icons/class/${imageName}.png`;
-}
+/* globals document, browser: true, fetch, Request, log */
+/* eslint-disable indent, max-len */
+const APPLICABLE_PROTOCOLS = ['http:', 'https:']; // eslint-disable-line no-unused-vars
+const REVIEW_PREFIX = 'tosdr/review/'; // eslint-disable-line no-unused-vars
+const RATING_TEXT = { // eslint-disable-line no-unused-vars
+    D: 'The terms of service are very uneven or there are some important issues that need your attention.',
+    E: 'The terms of service raise very serious concerns.',
+};
+
+const FALLBACK_API = 'https://api.tosdr.org/v1/service/'; // eslint-disable-line no-unused-vars
+const FALLBACK_SHIELDS = 'https://shields.tosdr.org/'; // eslint-disable-line no-unused-vars
+const FALLBACK_UPDATE_API = 'https://api.tosdr.org/updatecheck/';
+const services = []; // eslint-disable-line no-unused-vars
+
+/*
+Returns true only if the URL's protocol is in APPLICABLE_PROTOCOLS.
+*/
+function getDomain(url) {
+    const anchor = document.createElement('a');
+    anchor.href = url;
+    if (APPLICABLE_PROTOCOLS.includes(anchor.protocol)) {
+        if (anchor.hostname.startsWith('www.')) {
+            return anchor.hostname.substr(4);
+        }
+        return anchor.hostname;
+    }
+    return null;
+}
+
+function getRatingText(label) { // eslint-disable-line no-unused-vars
+    let text = String;
+    switch (label) {
+        case 'A':
+            text = 'The terms of service treat you fairly, respect your rights and follows the best practices.';
+            break;
+        case 'B':
+            text = 'The terms of services are fair towards the user but they could be improved.';
+            break;
+        case 'C':
+            text = 'The terms of service are okay but some issues need your consideration.';
+            break;
+        case 'D':
+            text = 'The terms of service are very uneven or there are some important issues that need your attention.';
+            break;
+        case 'E':
+            text = 'The terms of service raise very serious concerns.';
+            break;
+        default:
+            text = 'We haven\'t sufficiently reviewed the terms yet. Please contribute to on Phoenix: edit.tosdr.org';
+    }
+
+    return text;
+}
+
+function getTweetText(service) { // eslint-disable-line no-unused-vars
+    let text = String;
+    switch (service.class) {
+        case 'A':
+            text = `Thank you ${service.name} for caring about my privacy! Grade ${service.class}!`;
+            break;
+        case 'B':
+            text = `Thank you ${service.name} for caring about my privacy! Grade ${service.class} is good but it could be improved!`;
+            break;
+        case 'C':
+            text = `${service.name}, your Grade ${service.class} is not that good, can you comment?`;
+            break;
+        case 'D':
+        case 'E':
+            text = `Your Grade ${service.class} rating worries me ${service.name}, can you comment?`;
+            break;
+        default:
+            return false;
+    }
+
+    return text;
+}
+
+function compareVersion(version = null) { // eslint-disable-line no-unused-vars
+    let _version = version; // eslint-disable-line no-underscore-dangle
+    if (version === null) {
+        _version = browser.runtime.getManifest().version;
+    }
+    return browser.storage.local.get('settings').then((items) => {
+        const requestURL = `${(typeof items.settings === 'undefined' ? FALLBACK_UPDATE_API : items.settings.update_api_endpoint)}${_version}.json`;
+        const driveRequest = new Request(requestURL, {
+            method: 'GET',
+        });
+
+        return fetch(driveRequest).then((response) => {
+            if (response.status === 200) {
+                return response.json();
+            }
+            throw response.status;
+        });
+    });
+}
+
+function getServices() { // eslint-disable-line no-unused-vars
+    return browser.storage.local.get('settings').then((items) => {
+        const requestURL = `${(typeof items.settings === 'undefined' ? FALLBACK_API : items.settings.api_endpoint)}/all.json`;
+        const driveRequest = new Request(requestURL, {
+            method: 'GET',
+        });
+
+        return fetch(driveRequest).then((response) => {
+            if (response.status === 200) {
+                return response.json();
+            }
+            throw response.status;
+        });
+    });
+}
+
+function getDomainEntryFromStorage(domain) {
+    // console.log('getDomainEntryFromStorage', domain)
+    return browser.storage.local.get(REVIEW_PREFIX + domain)
+        .then(resultSet => resultSet[REVIEW_PREFIX + domain] || undefined);
+}
+
+function getLiveServiceDetails(domain, tries = 0) { // eslint-disable-line no-unused-vars
+    // console.log('getServiceDetails', domain, tries)
+    if (!domain) {
+        return Promise.reject(new Error('no domain name provided'));
+    }
+    if (tries > 10) {
+        return Promise.reject(new Error(`too many redirections ${domain}`));
+    }
+
+    return getDomainEntryFromStorage(domain).then(details => browser.storage.local.get('settings').then((items) => {
+        const requestURL = `${(typeof items.settings === 'undefined' ? FALLBACK_API : items.settings.api_endpoint)}/${details.id}.json`;
+        const driveRequest = new Request(requestURL, {
+            method: 'GET',
+        });
+
+        return fetch(driveRequest).then((response) => {
+            if (response.status === 200) {
+                return response.json().then(data => Object.assign({ mainDomain: domain }, data));
+            }
+            throw response.status;
+        });
+    }));
+}
+
+function getServiceDetails(domain, tries = 0) {
+    log('getServiceDetails', domain, tries);
+    if (!domain) {
+        return Promise.reject(new Error('no domain name provided'));
+    }
+    if (tries > 10) {
+        return Promise.reject(new Error(`too many redirections ${domain}`));
+    }
+
+    return getDomainEntryFromStorage(domain).then((details) => {
+        if (!details) {
+            const domainParts = domain.split('.');
+            if (domainParts.length > 2) {
+                log('trying parent domain');
+                return getServiceDetails(domainParts.slice(1).join('.'), tries + 1);
+            }
+            log('details of domain not found', domain);
+            return Promise.reject(new Error('details not found'));
+        }
+        if (details.see) {
+            return getServiceDetails(details.see, tries + 1);
+        }
+        // console.log('mainDomain set', details)
+        return Object.assign({
+            mainDomain: domain,
+        }, details);
+    });
+}
+
+function getService(tab) { // eslint-disable-line no-unused-vars
+    // console.log('getService', tab)
+    const domain = getDomain(tab.url);
+    return getServiceDetails(domain);
+}
+
+function getIconForService(service) { // eslint-disable-line no-unused-vars
+    const imageName = service.rated ? service.rated.toLowerCase() : 'false';
+    return `icons/class/${imageName}.png`;
+}
diff --git a/src/popup/popup.html b/src/popup/popup.html
index d91d3c4..673b93b 100644
--- a/src/popup/popup.html
+++ b/src/popup/popup.html
@@ -52,6 +52,7 @@ <h3>
                                 <i class="fas fa-file-word"></i> Add Document
                             </a>
                         </section>
+                        <span id="updatecheck">Checking the latest version...</span>
 
                         <section class="specificissues">
                             <ul class="tosdr-points">
@@ -77,6 +78,8 @@ <h3>
                             <a target="_blank" class="btn btn-danger" href="https://github.com/tosdr/browser-extensions/issues/new/choose">Report a bug</a>
                         </div>
                     </center>
+                    <hr />
+                    <span id="updatecheckbottom"></span>
                 </div>
             </div>
         </div>
diff --git a/src/settings/settings.html b/src/settings/settings.html
index 0b72f73..e2fbf2b 100644
--- a/src/settings/settings.html
+++ b/src/settings/settings.html
@@ -55,6 +55,12 @@ <h1>Advanced Settings</h1>
                                         Debug
                                     </label>
                                 </div>
+                                <div class="form-check">
+                                    <input class="form-check-input" type="checkbox" data-default="false" id="dontcheckforupdates" name="dontcheckforupdates">
+                                    <label class="form-check-label" for="dontcheckforupdates">
+                                        Disable Update Check
+                                    </label>
+                                </div>
                                 <div class="form-group">
                                     <label for="api_endpoint">API Endpoint Override:</label>
                                     <input type="text" class="form-control" id="api_endpoint" name="api_endpoint" data-default="https://api.tosdr.org/v1/service/" value="https://api.tosdr.org/v1/service/">