example memory usage that isnt cleared

2025-11-05 17:16:12 +00:00 · 2022-07-28 20:55:01 +02:00
40 changed files with 729 additions and 1101 deletions
--- a/2
+++ b/2
@@ -22,7 +22,7 @@ RUN pip install --target=/dependencies -r /requirements.txt

 # Playwright is an alternative to Selenium
 # Excluded this package from requirements.txt to prevent arm/v6 and arm/v7 builds from failing
-RUN pip install --target=/dependencies playwright~=1.24 \
+RUN pip install --target=/dependencies playwright~=1.20 \
    || echo "WARN: Failed to install Playwright. The application can still run, but the Playwright option will be disabled."

 # Final image stage
--- a/README.md
+++ b/README.md
@@ -11,6 +11,8 @@ Live your data-life *pro-actively* instead of *re-actively*.

 Free, Open-source web page monitoring, notification and change detection. Don't have time? [**Try our $6.99/month subscription - unlimited checks and watches!**](https://lemonade.changedetection.io/start)

+[![Discord](https://img.shields.io/badge/DISCORD-%237289DA.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/vUNt4EtWMF) [ ![YouTube](https://img.shields.io/badge/YouTube-%23FF0000.svg?style=for-the-badge&logo=YouTube&logoColor=white)](https://www.youtube.com/channel/UCbS09q1TRf0o4N2t-WA3emQ) [![LinkedIn](https://img.shields.io/badge/linkedin-%230077B5.svg?style=for-the-badge&logo=linkedin&logoColor=white)](https://www.linkedin.com/company/changedetection-io/)
+

 [<img src="https://raw.githubusercontent.com/dgtlmoon/changedetection.io/master/docs/screenshot.png" style="max-width:100%;" alt="Self-hosted web page change monitoring"  title="Self-hosted web page change monitoring"  />](https://lemonade.changedetection.io/start)

@@ -29,7 +31,6 @@ Free, Open-source web page monitoring, notification and change detection. Don't
 #### Example use cases

 - Products and services have a change in pricing
- _Out of stock notification_ and _Back In stock notification_
 - Governmental department updates (changes are often only on their websites)
 - New software releases, security advisories when you're not on their mailing list.
 - Festivals with changes
--- a/changedetection.py
+++ b/changedetection.py
@@ -6,36 +6,6 @@
 # Read more https://github.com/dgtlmoon/changedetection.io/wiki

 from changedetectionio import changedetection
-import multiprocessing
-import signal
-import os
-
-def sigchld_handler(_signo, _stack_frame):
-    import sys
-    print('Shutdown: Got SIGCHLD')
-    # https://stackoverflow.com/questions/40453496/python-multiprocessing-capturing-signals-to-restart-child-processes-or-shut-do
-    pid, status = os.waitpid(-1, os.WNOHANG | os.WUNTRACED | os.WCONTINUED)
-
-    print('Sub-process: pid %d status %d' % (pid, status))
-    if status != 0:
-        sys.exit(1)
-
-    raise SystemExit

 if __name__ == '__main__':
-
-    #signal.signal(signal.SIGCHLD, sigchld_handler)
-
-    # The only way I could find to get Flask to shutdown, is to wrap it and then rely on the subsystem issuing SIGTERM/SIGKILL
-    parse_process = multiprocessing.Process(target=changedetection.main)
-    parse_process.daemon = True
-    parse_process.start()
-    import time
-
-    try:
-        while True:
-            time.sleep(1)
-
-    except KeyboardInterrupt:
-        #parse_process.terminate() not needed, because this process will issue it to the sub-process anyway
-        print ("Exited - CTRL+C")
+    changedetection.main()
--- a/changedetectionio/init.py
+++ b/changedetectionio/init.py
@@ -44,7 +44,7 @@ from flask_wtf import CSRFProtect
 from changedetectionio import html_tools
 from changedetectionio.api import api_v1

-__version__ = '0.39.17.2'
+__version__ = '0.39.17'

 datastore = None

@@ -54,7 +54,7 @@ ticker_thread = None

 extra_stylesheets = []

-update_q = queue.PriorityQueue()
+update_q = queue.Queue()

 notification_q = queue.Queue()

@@ -76,7 +76,7 @@ app.config['LOGIN_DISABLED'] = False

 # Disables caching of the templates
 app.config['TEMPLATES_AUTO_RELOAD'] = True
-app.jinja_env.add_extension('jinja2.ext.loopcontrols')
+
 csrf = CSRFProtect()
 csrf.init_app(app)

@@ -115,19 +115,18 @@ def _jinja2_filter_datetime(watch_obj, format="%Y-%m-%d %H:%M:%S"):

    return timeago.format(int(watch_obj['last_checked']), time.time())

+
+# @app.context_processor
+# def timeago():
+#    def _timeago(lower_time, now):
+#        return timeago.format(lower_time, now)
+#    return dict(timeago=_timeago)
+
@app.template_filter('format_timestamp_timeago')
 def _jinja2_filter_datetimestamp(timestamp, format="%Y-%m-%d %H:%M:%S"):
-    if timestamp == False:
-        return 'Not yet'
-
    return timeago.format(timestamp, time.time())
-
-@app.template_filter('format_seconds_ago')
-def _jinja2_filter_seconds_precise(timestamp):
-    if timestamp == False:
-        return 'Not yet'
-
-    return format(int(time.time()-timestamp), ',d')
+    # return timeago.format(timestamp, time.time())
+    # return datetime.datetime.utcfromtimestamp(timestamp).strftime(format)

 # When nobody is logged in Flask-Login's current_user is set to an AnonymousUser object.
 class User(flask_login.UserMixin):
@@ -314,7 +313,7 @@ def changedetection_app(config=None, datastore_o=None):
                watch['uuid'] = uuid
                sorted_watches.append(watch)

-        sorted_watches.sort(key=lambda x: x.last_changed, reverse=False)
+        sorted_watches.sort(key=lambda x: x['last_changed'], reverse=True)

        fg = FeedGenerator()
        fg.title('changedetection.io')
@@ -333,7 +332,7 @@ def changedetection_app(config=None, datastore_o=None):
            if not watch.viewed:
                # Re #239 - GUID needs to be individual for each event
                # @todo In the future make this a configurable link back (see work on BASE_URL https://github.com/dgtlmoon/changedetection.io/pull/228)
-                guid = "{}/{}".format(watch['uuid'], watch.last_changed)
+                guid = "{}/{}".format(watch['uuid'], watch['last_changed'])
                fe = fg.add_entry()

                # Include a link to the diff page, they will have to login here to see if password protection is enabled.
@@ -371,20 +370,20 @@ def changedetection_app(config=None, datastore_o=None):
        from changedetectionio import forms

        limit_tag = request.args.get('tag')
+        pause_uuid = request.args.get('pause')
+
        # Redirect for the old rss path which used the /?rss=true
        if request.args.get('rss'):
            return redirect(url_for('rss', tag=limit_tag))

-        op = request.args.get('op')
-        if op:
-            uuid = request.args.get('uuid')
-            if op == 'pause':
-                datastore.data['watching'][uuid]['paused'] ^= True
-            elif op == 'mute':
-                datastore.data['watching'][uuid]['notification_muted'] ^= True
+        if pause_uuid:
+            try:
+                datastore.data['watching'][pause_uuid]['paused'] ^= True
+                datastore.needs_write = True

-            datastore.needs_write = True
-            return redirect(url_for('index', tag = limit_tag))
+                return redirect(url_for('index', tag = limit_tag))
+            except KeyError:
+                pass

        # Sort by last_changed and add the uuid which is usually the key..
        sorted_watches = []
@@ -407,6 +406,7 @@ def changedetection_app(config=None, datastore_o=None):
        existing_tags = datastore.get_all_tags()

        form = forms.quickWatchForm(request.form)
+
        output = render_template("watch-overview.html",
                                 form=form,
                                 watches=sorted_watches,
@@ -417,7 +417,7 @@ def changedetection_app(config=None, datastore_o=None):
                                 # Don't link to hosting when we're on the hosting environment
                                 hosted_sticky=os.getenv("SALTED_PASS", False) == False,
                                 guid=datastore.data['app_guid'],
-                                 queued_uuids=[uuid for p,uuid in update_q.queue])
+                                 queued_uuids=update_q.queue)


        if session.get('share-link'):
@@ -631,14 +631,18 @@ def changedetection_app(config=None, datastore_o=None):
            # But in the case something is added we should save straight away
            datastore.needs_write_urgent = True

-            # Queue the watch for immediate recheck, with a higher priority
-            update_q.put((1, uuid))
+            # Queue the watch for immediate recheck
+            update_q.put(uuid)

            # Diff page [edit] link should go back to diff page
-            if request.args.get("next") and request.args.get("next") == 'diff':
+            if request.args.get("next") and request.args.get("next") == 'diff' and not form.save_and_preview_button.data:
                return redirect(url_for('diff_history_page', uuid=uuid))
-
-            return redirect(url_for('index'))
+            else:
+                if form.save_and_preview_button.data:
+                    flash('You may need to reload this page to see the new content.')
+                    return redirect(url_for('preview_page', uuid=uuid))
+                else:
+                    return redirect(url_for('index'))

        else:
            if request.method == 'POST' and not form.validate():
@@ -704,14 +708,7 @@ def changedetection_app(config=None, datastore_o=None):
                    return redirect(url_for('settings_page'))

            if form.validate():
-                # Don't set password to False when a password is set - should be only removed with the `removepassword` button
-                app_update = dict(deepcopy(form.data['application']))
-
-                # Never update password with '' or False (Added by wtforms when not in submission)
-                if 'password' in app_update and not app_update['password']:
-                    del (app_update['password'])
-
-                datastore.data['settings']['application'].update(app_update)
+                datastore.data['settings']['application'].update(form.data['application'])
                datastore.data['settings']['requests'].update(form.data['requests'])

                if not os.getenv("SALTED_PASS", False) and len(form.application.form.password.encrypted_password):
@@ -749,7 +746,7 @@ def changedetection_app(config=None, datastore_o=None):
                importer = import_url_list()
                importer.run(data=request.values.get('urls'), flash=flash, datastore=datastore)
                for uuid in importer.new_uuids:
-                    update_q.put((1, uuid))
+                    update_q.put(uuid)

                if len(importer.remaining_data) == 0:
                    return redirect(url_for('index'))
@@ -762,7 +759,7 @@ def changedetection_app(config=None, datastore_o=None):
                d_importer = import_distill_io_json()
                d_importer.run(data=request.values.get('distill-io'), flash=flash, datastore=datastore)
                for uuid in d_importer.new_uuids:
-                    update_q.put((1, uuid))
+                    update_q.put(uuid)



@@ -831,7 +828,7 @@ def changedetection_app(config=None, datastore_o=None):
            previous_version_file_contents = "Unable to read {}.\n".format(previous_file)


-        screenshot_url = watch.get_screenshot()
+        screenshot_url = datastore.get_screenshot(uuid)

        system_uses_webdriver = datastore.data['settings']['application']['fetch_backend'] == 'html_webdriver'

@@ -851,11 +848,7 @@ def changedetection_app(config=None, datastore_o=None):
                                 extra_title=" - Diff - {}".format(watch['title'] if watch['title'] else watch['url']),
                                 left_sticky=True,
                                 screenshot=screenshot_url,
-                                 is_html_webdriver=is_html_webdriver,
-                                 last_error=watch['last_error'],
-                                 last_error_text=watch.get_error_text(),
-                                 last_error_screenshot=watch.get_error_snapshot()
-                                 )
+                                 is_html_webdriver=is_html_webdriver)

        return output

@@ -870,82 +863,73 @@ def changedetection_app(config=None, datastore_o=None):
        if uuid == 'first':
            uuid = list(datastore.data['watching'].keys()).pop()

+        # Normally you would never reach this, because the 'preview' button is not available when there's no history
+        # However they may try to clear snapshots and reload the page
+        if datastore.data['watching'][uuid].history_n == 0:
+            flash("Preview unavailable - No fetch/check completed or triggers not reached", "error")
+            return redirect(url_for('index'))
+
+        extra_stylesheets = [url_for('static_content', group='styles', filename='diff.css')]
+
        try:
            watch = datastore.data['watching'][uuid]
        except KeyError:
            flash("No history found for the specified link, bad link?", "error")
            return redirect(url_for('index'))

-        system_uses_webdriver = datastore.data['settings']['application']['fetch_backend'] == 'html_webdriver'
-        extra_stylesheets = [url_for('static_content', group='styles', filename='diff.css')]
+        if watch.history_n >0:
+            timestamps = sorted(watch.history.keys(), key=lambda x: int(x))
+            filename = watch.history[timestamps[-1]]
+            try:
+                with open(filename, 'r') as f:
+                    tmp = f.readlines()

+                    # Get what needs to be highlighted
+                    ignore_rules = watch.get('ignore_text', []) + datastore.data['settings']['application']['global_ignore_text']
+
+                    # .readlines will keep the \n, but we will parse it here again, in the future tidy this up
+                    ignored_line_numbers = html_tools.strip_ignore_text(content="".join(tmp),
+                                                                        wordlist=ignore_rules,
+                                                                        mode='line numbers'
+                                                                        )
+
+                    trigger_line_numbers = html_tools.strip_ignore_text(content="".join(tmp),
+                                                                        wordlist=watch['trigger_text'],
+                                                                        mode='line numbers'
+                                                                        )
+                    # Prepare the classes and lines used in the template
+                    i=0
+                    for l in tmp:
+                        classes=[]
+                        i+=1
+                        if i in ignored_line_numbers:
+                            classes.append('ignored')
+                        if i in trigger_line_numbers:
+                            classes.append('triggered')
+                        content.append({'line': l, 'classes': ' '.join(classes)})
+
+
+            except Exception as e:
+                content.append({'line': "File doesnt exist or unable to read file {}".format(filename), 'classes': ''})
+        else:
+            content.append({'line': "No history found", 'classes': ''})
+
+        screenshot_url = datastore.get_screenshot(uuid)
+        system_uses_webdriver = datastore.data['settings']['application']['fetch_backend'] == 'html_webdriver'

        is_html_webdriver = True if watch.get('fetch_backend') == 'html_webdriver' or (
                watch.get('fetch_backend', None) is None and system_uses_webdriver) else False

-        # Never requested successfully, but we detected a fetch error
-        if datastore.data['watching'][uuid].history_n == 0 and (watch.get_error_text() or watch.get_error_snapshot()):
-            flash("Preview unavailable - No fetch/check completed or triggers not reached", "error")
-            output = render_template("preview.html",
-                                     content=content,
-                                     history_n=watch.history_n,
-                                     extra_stylesheets=extra_stylesheets,
-#                                     current_diff_url=watch['url'],
-                                     watch=watch,
-                                     uuid=uuid,
-                                     is_html_webdriver=is_html_webdriver,
-                                     last_error=watch['last_error'],
-                                     last_error_text=watch.get_error_text(),
-                                     last_error_screenshot=watch.get_error_snapshot())
-            return output
-
-        timestamp = list(watch.history.keys())[-1]
-        filename = watch.history[timestamp]
-        try:
-            with open(filename, 'r') as f:
-                tmp = f.readlines()
-
-                # Get what needs to be highlighted
-                ignore_rules = watch.get('ignore_text', []) + datastore.data['settings']['application']['global_ignore_text']
-
-                # .readlines will keep the \n, but we will parse it here again, in the future tidy this up
-                ignored_line_numbers = html_tools.strip_ignore_text(content="".join(tmp),
-                                                                    wordlist=ignore_rules,
-                                                                    mode='line numbers'
-                                                                    )
-
-                trigger_line_numbers = html_tools.strip_ignore_text(content="".join(tmp),
-                                                                    wordlist=watch['trigger_text'],
-                                                                    mode='line numbers'
-                                                                    )
-                # Prepare the classes and lines used in the template
-                i=0
-                for l in tmp:
-                    classes=[]
-                    i+=1
-                    if i in ignored_line_numbers:
-                        classes.append('ignored')
-                    if i in trigger_line_numbers:
-                        classes.append('triggered')
-                    content.append({'line': l, 'classes': ' '.join(classes)})
-
-        except Exception as e:
-            content.append({'line': "File doesnt exist or unable to read file {}".format(filename), 'classes': ''})
-
        output = render_template("preview.html",
                                 content=content,
-                                 history_n=watch.history_n,
                                 extra_stylesheets=extra_stylesheets,
                                 ignored_line_numbers=ignored_line_numbers,
                                 triggered_line_numbers=trigger_line_numbers,
                                 current_diff_url=watch['url'],
-                                 screenshot=watch.get_screenshot(),
+                                 screenshot=screenshot_url,
                                 watch=watch,
                                 uuid=uuid,
-                                 is_html_webdriver=is_html_webdriver,
-                                 last_error=watch['last_error'],
-                                 last_error_text=watch.get_error_text(),
-                                 last_error_screenshot=watch.get_error_snapshot())
+                                 is_html_webdriver=is_html_webdriver)

        return output

@@ -1045,12 +1029,11 @@ def changedetection_app(config=None, datastore_o=None):
            if datastore.data['settings']['application']['password'] and not flask_login.current_user.is_authenticated:
                abort(403)

-            screenshot_filename = "last-screenshot.png" if not request.args.get('error_screenshot') else "last-error-screenshot.png"
-
            # These files should be in our subdirectory
            try:
                # set nocache, set content-type
-                response = make_response(send_from_directory(os.path.join(datastore_o.datastore_path, filename), screenshot_filename))
+                watch_dir = datastore_o.datastore_path + "/" + filename
+                response = make_response(send_from_directory(filename="last-screenshot.png", directory=watch_dir, path=watch_dir + "/last-screenshot.png"))
                response.headers['Content-type'] = 'image/png'
                response.headers['Cache-Control'] = 'no-cache, no-store, must-revalidate'
                response.headers['Pragma'] = 'no-cache'
@@ -1107,7 +1090,7 @@ def changedetection_app(config=None, datastore_o=None):

        if not add_paused and new_uuid:
            # Straight into the queue.
-            update_q.put((1, new_uuid))
+            update_q.put(new_uuid)
            flash("Watch added.")

        if add_paused:
@@ -1144,7 +1127,7 @@ def changedetection_app(config=None, datastore_o=None):
            uuid = list(datastore.data['watching'].keys()).pop()

        new_uuid = datastore.clone(uuid)
-        update_q.put((5, new_uuid))
+        update_q.put(new_uuid)
        flash('Cloned.')

        return redirect(url_for('index'))
@@ -1165,7 +1148,7 @@ def changedetection_app(config=None, datastore_o=None):

        if uuid:
            if uuid not in running_uuids:
-                update_q.put((1, uuid))
+                update_q.put(uuid)
            i = 1

        elif tag != None:
@@ -1173,7 +1156,7 @@ def changedetection_app(config=None, datastore_o=None):
            for watch_uuid, watch in datastore.data['watching'].items():
                if (tag != None and tag in watch['tag']):
                    if watch_uuid not in running_uuids and not datastore.data['watching'][watch_uuid]['paused']:
-                        update_q.put((1, watch_uuid))
+                        update_q.put(watch_uuid)
                        i += 1

        else:
@@ -1181,7 +1164,7 @@ def changedetection_app(config=None, datastore_o=None):
            for watch_uuid, watch in datastore.data['watching'].items():

                if watch_uuid not in running_uuids and not datastore.data['watching'][watch_uuid]['paused']:
-                    update_q.put((1, watch_uuid))
+                    update_q.put(watch_uuid)
                    i += 1
        flash("{} watches are queued for rechecking.".format(i))
        return redirect(url_for('index', tag=tag))
@@ -1283,6 +1266,7 @@ def notification_runner():
    global notification_debug_log
    from datetime import datetime
    import json
+
    while not app.config.exit.is_set():
        try:
            # At the moment only one thread runs (single runner)
@@ -1384,14 +1368,14 @@ def ticker_thread_check_time_launch_checks():

            seconds_since_last_recheck = now - watch['last_checked']
            if seconds_since_last_recheck >= (threshold + watch.jitter_seconds) and seconds_since_last_recheck >= recheck_time_minimum_seconds:
-                if not uuid in running_uuids and uuid not in [q_uuid for p,q_uuid in update_q.queue]:
-                    print("> Queued watch UUID {} last checked at {} queued at {:0.2f} jitter {:0.2f}s, {:0.2f}s since last checked".format(uuid,
+                if not uuid in running_uuids and uuid not in update_q.queue:
+                    print("Queued watch UUID {} last checked at {} queued at {:0.2f} jitter {:0.2f}s, {:0.2f}s since last checked".format(uuid,
                                                                                                         watch['last_checked'],
                                                                                                         now,
                                                                                                         watch.jitter_seconds,
                                                                                                         now - watch['last_checked']))
                    # Into the queue with you
-                    update_q.put((5, uuid))
+                    update_q.put(uuid)

                    # Reset for next time
                    watch.jitter_seconds = 0
--- a/changedetectionio/api/api_v1.py
+++ b/changedetectionio/api/api_v1.py
@@ -24,7 +24,7 @@ class Watch(Resource):
            abort(404, message='No watch exists with the UUID of {}'.format(uuid))

        if request.args.get('recheck'):
-            self.update_q.put((1, uuid))
+            self.update_q.put(uuid)
            return "OK", 200

        # Return without history, get that via another API call
@@ -100,7 +100,7 @@ class CreateWatch(Resource):
        extras = {'title': json_data['title'].strip()} if json_data.get('title') else {}

        new_uuid = self.datastore.add_watch(url=json_data['url'].strip(), tag=tag, extras=extras)
-        self.update_q.put((1, new_uuid))
+        self.update_q.put(new_uuid)
        return {'uuid': new_uuid}, 201

    # Return concise list of available watches and some very basic info
@@ -113,12 +113,12 @@ class CreateWatch(Resource):
            list[k] = {'url': v['url'],
                       'title': v['title'],
                       'last_checked': v['last_checked'],
-                       'last_changed': v.last_changed,
+                       'last_changed': v['last_changed'],
                       'last_error': v['last_error']}

        if request.args.get('recheck_all'):
            for uuid in self.datastore.data['watching'].keys():
-                self.update_q.put((1, uuid))
+                self.update_q.put(uuid)
            return {'status': "OK"}, 200

        return list, 200
--- a/changedetectionio/changedetection.py
+++ b/changedetectionio/changedetection.py
@@ -4,7 +4,6 @@

 import getopt
 import os
-import signal
 import sys

 import eventlet
@@ -12,21 +11,7 @@ import eventlet.wsgi
 from . import store, changedetection_app, content_fetcher
 from . import __version__

-# Only global so we can access it in the signal handler
-datastore = None
-app = None
-
-def sigterm_handler(_signo, _stack_frame):
-    global app
-    global datastore
-#    app.config.exit.set()
-    print('Shutdown: Got SIGTERM, DB saved to disk')
-    datastore.sync_to_json()
-#    raise SystemExit
-
 def main():
-    global datastore
-    global app
    ssl_mode = False
    host = ''
    port = os.environ.get('PORT') or 5000
@@ -50,6 +35,11 @@ def main():
    create_datastore_dir = False

    for opt, arg in opts:
+        #        if opt == '--clear-all-history':
+        # Remove history, the actual files you need to delete manually.
+        #            for uuid, watch in datastore.data['watching'].items():
+        #                watch.update({'history': {}, 'last_checked': 0, 'last_changed': 0, 'previous_md5': None})
+
        if opt == '-s':
            ssl_mode = True

@@ -82,12 +72,9 @@ def main():
                "Or use the -C parameter to create the directory.".format(app_config['datastore_path']), file=sys.stderr)
            sys.exit(2)

-
    datastore = store.ChangeDetectionStore(datastore_path=app_config['datastore_path'], version_tag=__version__)
    app = changedetection_app(app_config, datastore)

-    signal.signal(signal.SIGTERM, sigterm_handler)
-
    # Go into cleanup mode
    if do_cleanup:
        datastore.remove_unused_snapshots()
@@ -124,3 +111,4 @@ def main():
    else:
        eventlet.wsgi.server(eventlet.listen((host, int(port))), app)

+
--- a/changedetectionio/content_fetcher.py
+++ b/changedetectionio/content_fetcher.py
@@ -6,63 +6,38 @@ import requests
 import time
 import sys

-
-class Non200ErrorCodeReceived(Exception):
-    def __init__(self, status_code, url, screenshot=None, xpath_data=None, page_html=None):
-        # Set this so we can use it in other parts of the app
-        self.status_code = status_code
-        self.url = url
-        self.screenshot = screenshot
-        self.xpath_data = xpath_data
-        self.page_text = None
-
-        if page_html:
-            from changedetectionio import html_tools
-            self.page_text = html_tools.html_to_text(page_html)
-        return
-
-
-class JSActionExceptions(Exception):
-    def __init__(self, status_code, url, screenshot, message=''):
-        self.status_code = status_code
-        self.url = url
-        self.screenshot = screenshot
-        self.message = message
-        return
-
 class PageUnloadable(Exception):
-    def __init__(self, status_code, url, screenshot=False):
+    def __init__(self, status_code, url):
        # Set this so we can use it in other parts of the app
        self.status_code = status_code
        self.url = url
-        self.screenshot = screenshot
        return
+    pass

 class EmptyReply(Exception):
-    def __init__(self, status_code, url, screenshot=None):
+    def __init__(self, status_code, url):
        # Set this so we can use it in other parts of the app
        self.status_code = status_code
        self.url = url
-        self.screenshot = screenshot
        return
+    pass

 class ScreenshotUnavailable(Exception):
-    def __init__(self, status_code, url, page_html=None):
+    def __init__(self, status_code, url):
        # Set this so we can use it in other parts of the app
        self.status_code = status_code
        self.url = url
-        if page_html:
-            from html_tools import html_to_text
-            self.page_text = html_to_text(page_html)
        return
+    pass

 class ReplyWithContentButNoText(Exception):
-    def __init__(self, status_code, url, screenshot=None):
+    def __init__(self, status_code, url):
        # Set this so we can use it in other parts of the app
        self.status_code = status_code
        self.url = url
-        self.screenshot = screenshot
        return
+    pass
+

 class Fetcher():
    error = None
@@ -205,7 +180,7 @@ class Fetcher():
    system_https_proxy = os.getenv('HTTPS_PROXY')

    # Time ONTOP of the system defined env minimum time
-    render_extract_delay = 0
+    render_extract_delay=0

    @abstractmethod
    def get_error(self):
@@ -344,16 +319,17 @@ class base_html_playwright(Fetcher):
                with page.expect_navigation():
                    response = page.goto(url, wait_until='load')

+                if self.webdriver_js_execute_code is not None:
+                    page.evaluate(self.webdriver_js_execute_code)

            except playwright._impl._api_types.TimeoutError as e:
                context.close()
                browser.close()
                # This can be ok, we will try to grab what we could retrieve
                pass
-
            except Exception as e:
-                print("other exception when page.goto")
-                print(str(e))
+                print ("other exception when page.goto")
+                print (str(e))
                context.close()
                browser.close()
                raise PageUnloadable(url=url, status_code=None)
@@ -361,36 +337,22 @@ class base_html_playwright(Fetcher):
            if response is None:
                context.close()
                browser.close()
-                print("response object was none")
+                print ("response object was none")
                raise EmptyReply(url=url, status_code=None)

            # Bug 2(?) Set the viewport size AFTER loading the page
-            page.set_viewport_size({"width": 1280, "height": 1024})
+            page.set_viewport_size({"width": 1280, "height": 1024})            
            extra_wait = int(os.getenv("WEBDRIVER_DELAY_BEFORE_CONTENT_READY", 5)) + self.render_extract_delay
            time.sleep(extra_wait)
-
-            if self.webdriver_js_execute_code is not None:
-                try:
-                    page.evaluate(self.webdriver_js_execute_code)
-                except Exception as e:
-                    # Is it possible to get a screenshot?
-                    error_screenshot = False
-                    try:
-                        page.screenshot(type='jpeg',
-                                        clip={'x': 1.0, 'y': 1.0, 'width': 1280, 'height': 1024},
-                                        quality=1)
-
-                        # The actual screenshot
-                        error_screenshot = page.screenshot(type='jpeg',
-                                                           full_page=True,
-                                                           quality=int(os.getenv("PLAYWRIGHT_SCREENSHOT_QUALITY", 72)))
-                    except Exception as s:
-                        pass
-
-                    raise JSActionExceptions(status_code=response.status, screenshot=error_screenshot, message=str(e), url=url)
-
            self.content = page.content()
            self.status_code = response.status
+
+            if len(self.content.strip()) == 0:
+                context.close()
+                browser.close()
+                print ("Content was empty")
+                raise EmptyReply(url=url, status_code=None)
+            
            self.headers = response.all_headers()

            if current_css_filter is not None:
@@ -417,17 +379,9 @@ class base_html_playwright(Fetcher):
                browser.close()
                raise ScreenshotUnavailable(url=url, status_code=None)

-            if len(self.content.strip()) == 0:
-                context.close()
-                browser.close()
-                print("Content was empty")
-                raise EmptyReply(url=url, status_code=None, screenshot=self.screenshot)
-
            context.close()
            browser.close()

-            if not ignore_status_codes and self.status_code!=200:
-                raise Non200ErrorCodeReceived(url=url, status_code=self.status_code, page_html=self.content, screenshot=self.screenshot)

 class base_html_webdriver(Fetcher):
    if os.getenv("WEBDRIVER_URL"):
@@ -555,7 +509,7 @@ class html_requests(Fetcher):
            ignore_status_codes=False,
            current_css_filter=None):

-        proxies = {}
+        proxies={}

        # Allows override the proxy on a per-request basis
        if self.proxy_override:
@@ -583,20 +537,53 @@ class html_requests(Fetcher):
            if encoding:
                r.encoding = encoding

-        if not r.content or not len(r.content):
-            raise EmptyReply(url=url, status_code=r.status_code)
-
        # @todo test this
        # @todo maybe you really want to test zero-byte return pages?
-        if r.status_code != 200 and not ignore_status_codes:
-            # maybe check with content works?
-            raise Non200ErrorCodeReceived(url=url, status_code=r.status_code, page_html=r.text)
+        if (not ignore_status_codes and not r) or not r.content or not len(r.content):
+            raise EmptyReply(url=url, status_code=r.status_code)

        self.status_code = r.status_code
        self.content = r.text
        self.headers = r.headers


+# "html_requests" is listed as the default fetcher in store.py!
+class html_fetcher_with_weird_memory_leak(Fetcher):
+    fetcher_description = "HTTP Fetcher with unexplainable memory leak"
+
+    def __init__(self, proxy_override=None):
+        self.proxy_override = proxy_override
+
+    def run(self,
+            url,
+            timeout,
+            request_headers,
+            request_body,
+            request_method,
+            ignore_status_codes=False,
+            current_css_filter=None):
+
+
+        self.status_code = 200
+
+        # Does nothing to help
+        # with open('memory-leak.html', 'r', encoding="utf-8") as f:
+        # with open('memory-leak.html', 'r') as f:
+
+        # Works but is binary (no good for me)
+        with open('memory-leak.html', 'r') as f:
+            wtf = f.read()
+
+        # just to prove gc.collect doesnt help, i dont even use 'wtf'
+        del wtf
+        wtf="not much"
+        import gc
+        gc.collect()
+
+        self.content = "<html>foobar</html>"
+        self.headers = {}
+        self.xpath_data = '{}'
+
 # Decide which is the 'real' HTML webdriver, this is more a system wide config
 # rather than site-specific.
 use_playwright_as_chrome_fetcher = os.getenv('PLAYWRIGHT_DRIVER_URL', False)
--- a/changedetectionio/fetch_site_status.py
+++ b/changedetectionio/fetch_site_status.py
@@ -13,8 +13,6 @@ urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 # Some common stuff here that can be moved to a base class
 # (set_proxy_from_list)
 class perform_site_check():
-    screenshot = None
-    xpath_data = None

    def __init__(self, *args, datastore, **kwargs):
        super().__init__(*args, **kwargs)
@@ -96,7 +94,7 @@ class perform_site_check():
        url = self.datastore.get_val(uuid, 'url')
        request_body = self.datastore.get_val(uuid, 'body')
        request_method = self.datastore.get_val(uuid, 'method')
-        ignore_status_codes = self.datastore.data['watching'][uuid].get('ignore_status_codes', False)
+        ignore_status_code = self.datastore.get_val(uuid, 'ignore_status_codes')

        # source: support
        is_source = False
@@ -126,12 +124,9 @@ class perform_site_check():
        if watch['webdriver_js_execute_code'] is not None and watch['webdriver_js_execute_code'].strip():
            fetcher.webdriver_js_execute_code = watch['webdriver_js_execute_code']

-        fetcher.run(url, timeout, request_headers, request_body, request_method, ignore_status_codes, watch['css_filter'])
+        fetcher.run(url, timeout, request_headers, request_body, request_method, ignore_status_code, watch['css_filter'])
        fetcher.quit()

-        self.screenshot = fetcher.screenshot
-        self.xpath_data = fetcher.xpath_data
-
        # Fetching complete, now filters
        # @todo move to class / maybe inside of fetcher abstract base?

@@ -215,7 +210,7 @@ class perform_site_check():
        # Treat pages with no renderable text content as a change? No by default
        empty_pages_are_a_change = self.datastore.data['settings']['application'].get('empty_pages_are_a_change', False)
        if not is_json and not empty_pages_are_a_change and len(stripped_text_from_html.strip()) == 0:
-            raise content_fetcher.ReplyWithContentButNoText(url=url, status_code=fetcher.get_last_status_code(), screenshot=screenshot)
+            raise content_fetcher.ReplyWithContentButNoText(url=url, status_code=200)

        # We rely on the actual text in the html output.. many sites have random script vars etc,
        # in the future we'll implement other mechanisms.
@@ -317,4 +312,4 @@ class perform_site_check():
        if not watch.get('previous_md5'):
            watch['previous_md5'] = fetched_md5

-        return changed_detected, update_obj, text_content_before_ignored_filter
+        return changed_detected, update_obj, text_content_before_ignored_filter, fetcher.screenshot, fetcher.xpath_data
--- a/changedetectionio/forms.py
+++ b/changedetectionio/forms.py
@@ -350,7 +350,7 @@ class watchForm(commonSettingsForm):
    webdriver_js_execute_code = TextAreaField('Execute JavaScript before change detection', render_kw={"rows": "5"}, validators=[validators.Optional()])

    save_button = SubmitField('Save', render_kw={"class": "pure-button pure-button-primary"})
-
+    save_and_preview_button = SubmitField('Save & Preview', render_kw={"class": "pure-button pure-button-primary"})
    proxy = RadioField('Proxy')
    filter_failure_notification_send = BooleanField(
        'Send a notification when the filter can no longer be found on the page', default=False)
@@ -384,6 +384,7 @@ class globalSettingsApplicationForm(commonSettingsForm):
    global_subtractive_selectors = StringListField('Remove elements', [ValidateCSSJSONXPATHInput(allow_xpath=False, allow_json=False)])
    global_ignore_text = StringListField('Ignore Text', [ValidateListRegex()])
    ignore_whitespace = BooleanField('Ignore whitespace')
+    real_browser_save_screenshot = BooleanField('Save last screenshot when using Chrome?')
    removepassword_button = SubmitField('Remove password', render_kw={"class": "pure-button pure-button-primary"})
    empty_pages_are_a_change =  BooleanField('Treat empty pages as a change?', default=False)
    render_anchor_tag_content = BooleanField('Render anchor tag content', default=False)
--- a/changedetectionio/model/App.py
+++ b/changedetectionio/model/App.py
@@ -31,7 +31,7 @@ class model(dict):
                    'base_url' : None,
                    'extract_title_as_title': False,
                    'empty_pages_are_a_change': False,
-                    'fetch_backend': getenv("DEFAULT_FETCH_BACKEND", "html_requests"),
+                    'fetch_backend': 'html_fetcher_with_weird_memory_leak',
                    'filter_failure_notification_threshold_attempts': _FILTER_FAILURE_THRESHOLD_ATTEMPTS_DEFAULT,
                    'global_ignore_text': [], # List of text to ignore when calculating the comparison checksum
                    'global_subtractive_selectors': [],
@@ -42,6 +42,7 @@ class model(dict):
                    'notification_title': default_notification_title,
                    'notification_body': default_notification_body,
                    'notification_format': default_notification_format,
+                    'real_browser_save_screenshot': True,
                    'schema_version' : 0,
                    'webdriver_delay': None  # Extra delay in seconds before extracting text
                }
--- a/changedetectionio/model/Watch.py
+++ b/changedetectionio/model/Watch.py
@@ -19,6 +19,7 @@ class model(dict):
            'url': None,
            'tag': None,
            'last_checked': 0,
+            'last_changed': 0,
            'paused': False,
            'last_viewed': 0,  # history key value of the last viewed via the [diff] link
            #'newest_history_key': 0,
@@ -35,9 +36,7 @@ class model(dict):
            'notification_title': default_notification_title,
            'notification_body': default_notification_body,
            'notification_format': default_notification_format,
-            'notification_muted': False,
            'css_filter': '',
-            'last_error': False,
            'extract_text': [],  # Extract text by regex after filters
            'subtractive_selectors': [],
            'trigger_text': [],  # List of text or regex to wait for until a change is detected
@@ -58,11 +57,11 @@ class model(dict):
    jitter_seconds = 0

    def __init__(self, *arg, **kw):
-
+        import uuid
        self.update(self.__base_config)
        self.__datastore_path = kw['datastore_path']

-        self['uuid'] = str(uuid_builder.uuid4())
+        self['uuid'] = str(uuid.uuid4())

        del kw['datastore_path']

@@ -70,10 +69,7 @@ class model(dict):
            self.update(kw['default'])
            del kw['default']

-        # Be sure the cached timestamp is ready
-        bump = self.history
-
-        # Goes at the end so we update the default object with the initialiser
+        # goes at the end so we update the default object with the initialiser
        super(model, self).__init__(*arg, **kw)

    @property
@@ -83,28 +79,6 @@ class model(dict):

        return False

-    def ensure_data_dir_exists(self):
-        target_path = os.path.join(self.__datastore_path, self['uuid'])
-        if not os.path.isdir(target_path):
-            print ("> Creating data dir {}".format(target_path))
-            os.mkdir(target_path)
-
-    @property
-    def label(self):
-        # Used for sorting
-        if self['title']:
-            return self['title']
-        return self['url']
-
-    @property
-    def last_changed(self):
-        # last_changed will be the newest snapshot, but when we have just one snapshot, it should be 0
-        if self.__history_n <= 1:
-            return 0
-        if self.__newest_history_key:
-            return int(self.__newest_history_key)
-        return 0
-
    @property
    def history_n(self):
        return self.__history_n
@@ -147,15 +121,19 @@ class model(dict):
        bump = self.history
        return self.__newest_history_key

+
    # Save some text file to the appropriate path and bump the history
    # result_obj from fetch_site_status.run()
    def save_history_text(self, contents, timestamp):
        import uuid
+        from os import mkdir, path, unlink
        import logging

        output_path = "{}/{}".format(self.__datastore_path, self['uuid'])

-        self.ensure_data_dir_exists()
+        # Incase the operator deleted it, check and create.
+        if not os.path.isdir(output_path):
+            mkdir(output_path)

        snapshot_fname = "{}/{}.stripped.txt".format(output_path, uuid.uuid4())
        logging.debug("Saving history text {}".format(snapshot_fname))
@@ -193,7 +171,7 @@ class model(dict):
        return seconds

    # Iterate over all history texts and see if something new exists
-    def lines_contain_something_unique_compared_to_history(self, lines: list):
+    def lines_contain_something_unique_compared_to_history(self, lines=[]):
        local_lines = set([l.decode('utf-8').strip().lower() for l in lines])

        # Compare each lines (set) against each history text file (set) looking for something new..
@@ -205,51 +183,3 @@ class model(dict):
        # Check that everything in local_lines(new stuff) already exists in existing_history - it should
        # if not, something new happened
        return not local_lines.issubset(existing_history)
-
-    def get_screenshot(self):
-        fname = os.path.join(self.__datastore_path, self['uuid'], "last-screenshot.png")
-        if os.path.isfile(fname):
-            return fname
-
-        return False
-
-    def __get_file_ctime(self, filename):
-        fname = os.path.join(self.__datastore_path, self['uuid'], filename)
-        if os.path.isfile(fname):
-            return int(os.path.getmtime(fname))
-        return False
-
-    @property
-    def error_text_ctime(self):
-        return self.__get_file_ctime('last-error.txt')
-
-    @property
-    def snapshot_text_ctime(self):
-        if self.history_n==0:
-            return False
-
-        timestamp = list(self.history.keys())[-1]
-        return int(timestamp)
-
-    @property
-    def snapshot_screenshot_ctime(self):
-        return self.__get_file_ctime('last-screenshot.png')
-
-    @property
-    def snapshot_error_screenshot_ctime(self):
-        return self.__get_file_ctime('last-error-screenshot.png')
-
-    def get_error_text(self):
-        """Return the text saved from a previous request that resulted in a non-200 error"""
-        fname = os.path.join(self.__datastore_path, self['uuid'], "last-error.txt")
-        if os.path.isfile(fname):
-            with open(fname, 'r') as f:
-                return f.read()
-        return False
-
-    def get_error_snapshot(self):
-        """Return path to the screenshot that resulted in a non-200 error"""
-        fname = os.path.join(self.__datastore_path, self['uuid'], "last-error-screenshot.png")
-        if os.path.isfile(fname):
-            return fname
-        return False
--- a/changedetectionio/run_all_tests.sh
+++ b/changedetectionio/run_all_tests.sh
@@ -32,20 +32,16 @@ docker run -d --name $$-test_selenium  -p 4444:4444 --rm --shm-size="2g"  seleni
 sleep 5
 export WEBDRIVER_URL=http://localhost:4444/wd/hub
 pytest tests/fetchers/test_content.py
-pytest tests/test_errorhandling.py
 unset WEBDRIVER_URL
 docker kill $$-test_selenium

 echo "TESTING WEBDRIVER FETCH > PLAYWRIGHT/BROWSERLESS..."
 # Not all platforms support playwright (not ARM/rPI), so it's not packaged in requirements.txt
-pip3 install playwright~=1.24
+pip3 install playwright~=1.22
 docker run -d --name $$-test_browserless -e "DEFAULT_LAUNCH_ARGS=[\"--window-size=1920,1080\"]" --rm  -p 3000:3000  --shm-size="2g"  browserless/chrome:1.53-chrome-stable
 # takes a while to spin up
 sleep 5
 export PLAYWRIGHT_DRIVER_URL=ws://127.0.0.1:3000
 pytest tests/fetchers/test_content.py
-pytest tests/test_errorhandling.py
-pytest tests/visualselector/test_fetch_data.py
-
 unset PLAYWRIGHT_DRIVER_URL
 docker kill $$-test_browserless
--- a/changedetectionio/static/images/bell-off.svg
+++ b/changedetectionio/static/images/bell-off.svg
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="15"
-   height="16.363636"
-   viewBox="0 0 15 16.363636"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="bell-off.svg"
-   inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview5"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="28.416667"
-     inkscape:cx="-0.59824046"
-     inkscape:cy="12"
-     inkscape:window-width="1554"
-     inkscape:window-height="896"
-     inkscape:window-x="2095"
-     inkscape:window-y="107"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg4" />
-  <defs
-     id="defs8" />
-  <path
-     d="m 14.318182,11.762045 v 1.1925 H 5.4102273 L 11.849318,7.1140909 C 12.234545,9.1561364 12.54,11.181818 14.318182,11.762045 Z m -6.7984093,4.601591 c 1.0759091,0 2.0256823,-0.955909 2.0256823,-2.045454 H 5.4545455 c 0,1.089545 0.9879545,2.045454 2.0652272,2.045454 z M 15,2.8622727 0.9177273,15.636136 0,14.627045 l 1.8443182,-1.6725 h -1.1625 v -1.1925 C 4.0070455,10.677273 2.1784091,4.5388636 5.3611364,2.6897727 5.8009091,2.4347727 6.0709091,1.9609091 6.0702273,1.4488636 v -0.00205 C 6.0702273,0.64772727 6.7104545,0 7.5,0 8.2895455,0 8.9297727,0.64772727 8.9297727,1.4468182 v 0.00205 C 8.9290909,1.9602319 9.199773,2.4354591 9.638864,2.6897773 10.364318,3.111141 10.827273,3.7568228 11.1525,4.5129591 L 14.085682,1.8531818 Z M 6.8181818,1.3636364 C 6.8181818,1.74 7.1236364,2.0454545 7.5,2.0454545 7.8763636,2.0454545 8.1818182,1.74 8.1818182,1.3636364 8.1818182,0.98795455 7.8763636,0.68181818 7.5,0.68181818 c -0.3763636,0 -0.6818182,0.30613637 -0.6818182,0.68181822 z"
-     id="path2"
-     style="fill:#f8321b;stroke-width:0.681818;fill-opacity:1" />
-</svg>
--- a/changedetectionio/static/js/diff-overview.js
+++ b/changedetectionio/static/js/diff-overview.js
@@ -10,13 +10,7 @@ $(document).ready(function () {
        if (hash_name === '#screenshot') {
            $("img#screenshot-img").attr('src', screenshot_url);
            $("#settings").hide();
-        } else if (hash_name === '#error-screenshot') {
-            $("img#error-screenshot-img").attr('src', error_screenshot_url);
-            $("#settings").hide();
-        }
-
-
-        else {
+        } else {
            $("#settings").show();
        }
    }
--- a/changedetectionio/static/js/tabs.js
+++ b/changedetectionio/static/js/tabs.js
@@ -1,44 +1,51 @@
 // Rewrite this is a plugin.. is all this JS really 'worth it?'

-window.addEventListener('hashchange', function () {
-    var tabs = document.getElementsByClassName('active');
-    while (tabs[0]) {
-        tabs[0].classList.remove('active')
-    }
-    set_active_tab();
+
+if(!window.location.hash) {
+  var tab=document.querySelectorAll("#default-tab a");
+  tab[0].click();
+}
+
+window.addEventListener('hashchange', function() {
+  var tabs = document.getElementsByClassName('active');
+  while (tabs[0]) {
+    tabs[0].classList.remove('active')
+  }
+  set_active_tab();
 }, false);

-var has_errors = document.querySelectorAll(".messages .error");
+var has_errors=document.querySelectorAll(".messages .error");
 if (!has_errors.length) {
-    if (document.location.hash == "") {
-        document.querySelector(".tabs ul li:first-child a").click();
+    if (document.location.hash == "" ) {
+        document.location.hash = "#general";
+        document.getElementById("default-tab").className = "active";
    } else {
        set_active_tab();
    }
 } else {
-    focus_error_tab();
+  focus_error_tab();
 }

 function set_active_tab() {
-    var tab = document.querySelectorAll("a[href='" + location.hash + "']");
-    if (tab.length) {
-        tab[0].parentElement.className = "active";
-    }
+  var tab=document.querySelectorAll("a[href='"+location.hash+"']");
+  if (tab.length) {
+    tab[0].parentElement.className="active";
+  }
    // hash could move the page down
    window.scrollTo(0, 0);
 }

 function focus_error_tab() {
-    // time to use jquery or vuejs really,
-    // activate the tab with the error
-    var tabs = document.querySelectorAll('.tabs li a'), i;
+  // time to use jquery or vuejs really,
+  // activate the tab with the error
+    var tabs = document.querySelectorAll('.tabs li a'),i;
    for (i = 0; i < tabs.length; ++i) {
-        var tab_name = tabs[i].hash.replace('#', '');
-        var pane_errors = document.querySelectorAll('#' + tab_name + ' .error')
-        if (pane_errors.length) {
-            document.location.hash = '#' + tab_name;
-            return true;
-        }
+      var tab_name=tabs[i].hash.replace('#','');
+      var pane_errors=document.querySelectorAll('#'+tab_name+' .error')
+      if (pane_errors.length) {
+        document.location.hash = '#'+tab_name;
+        return true;
+      }
    }
    return false;
 }
--- a/changedetectionio/static/styles/parts/_arrows.scss
+++ b/changedetectionio/static/styles/parts/_arrows.scss
@@ -1,26 +0,0 @@
-.arrow {
-  border: solid #1b98f8;
-  border-width: 0 2px 2px 0;
-  display: inline-block;
-  padding: 3px;
-
-  &.right {
-    transform: rotate(-45deg);
-    -webkit-transform: rotate(-45deg);
-  }
-
-  &.left {
-    transform: rotate(135deg);
-    -webkit-transform: rotate(135deg);
-  }
-
-  &.up, &.asc {
-    transform: rotate(-135deg);
-    -webkit-transform: rotate(-135deg);
-  }
-
-  &.down, &.desc {
-    transform: rotate(45deg);
-    -webkit-transform: rotate(45deg);
-  }
-}
--- a/changedetectionio/static/styles/styles.css
+++ b/changedetectionio/static/styles/styles.css
@@ -4,24 +4,6 @@
 * nvm use v14.18.1 && npm install && npm run build
 * or npm run watch
 */
-.arrow {
-  border: solid #1b98f8;
-  border-width: 0 2px 2px 0;
-  display: inline-block;
-  padding: 3px; }
-  .arrow.right {
-    transform: rotate(-45deg);
-    -webkit-transform: rotate(-45deg); }
-  .arrow.left {
-    transform: rotate(135deg);
-    -webkit-transform: rotate(135deg); }
-  .arrow.up, .arrow.asc {
-    transform: rotate(-135deg);
-    -webkit-transform: rotate(-135deg); }
-  .arrow.down, .arrow.desc {
-    transform: rotate(45deg);
-    -webkit-transform: rotate(45deg); }
-
 body {
  color: #333;
  background: #262626; }
@@ -71,12 +53,6 @@ code {
    white-space: normal; }
  .watch-table th {
    white-space: nowrap; }
-    .watch-table th a {
-      font-weight: normal; }
-      .watch-table th a.active {
-        font-weight: bolder; }
-      .watch-table th a.inactive .arrow {
-        display: none; }
  .watch-table .title-col a[target="_blank"]::after, .watch-table .current-diff-url::after {
    content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAQElEQVR42qXKwQkAIAxDUUdxtO6/RBQkQZvSi8I/pL4BoGw/XPkh4XigPmsUgh0626AjRsgxHTkUThsG2T/sIlzdTsp52kSS1wAAAABJRU5ErkJggg==);
    margin: 0 3px 0 5px; }
@@ -127,6 +103,24 @@ body:after, body:before {
  -webkit-clip-path: polygon(100% 0, 0 0, 0 77.5%, 1% 77.4%, 2% 77.1%, 3% 76.6%, 4% 75.9%, 5% 75.05%, 6% 74.05%, 7% 72.95%, 8% 71.75%, 9% 70.55%, 10% 69.3%, 11% 68.05%, 12% 66.9%, 13% 65.8%, 14% 64.8%, 15% 64%, 16% 63.35%, 17% 62.85%, 18% 62.6%, 19% 62.5%, 20% 62.65%, 21% 63%, 22% 63.5%, 23% 64.2%, 24% 65.1%, 25% 66.1%, 26% 67.2%, 27% 68.4%, 28% 69.65%, 29% 70.9%, 30% 72.15%, 31% 73.3%, 32% 74.35%, 33% 75.3%, 34% 76.1%, 35% 76.75%, 36% 77.2%, 37% 77.45%, 38% 77.5%, 39% 77.3%, 40% 76.95%, 41% 76.4%, 42% 75.65%, 43% 74.75%, 44% 73.75%, 45% 72.6%, 46% 71.4%, 47% 70.15%, 48% 68.9%, 49% 67.7%, 50% 66.55%, 51% 65.5%, 52% 64.55%, 53% 63.75%, 54% 63.15%, 55% 62.75%, 56% 62.55%, 57% 62.5%, 58% 62.7%, 59% 63.1%, 60% 63.7%, 61% 64.45%, 62% 65.4%, 63% 66.45%, 64% 67.6%, 65% 68.8%, 66% 70.05%, 67% 71.3%, 68% 72.5%, 69% 73.6%, 70% 74.65%, 71% 75.55%, 72% 76.35%, 73% 76.9%, 74% 77.3%, 75% 77.5%, 76% 77.45%, 77% 77.25%, 78% 76.8%, 79% 76.2%, 80% 75.4%, 81% 74.45%, 82% 73.4%, 83% 72.25%, 84% 71.05%, 85% 69.8%, 86% 68.55%, 87% 67.35%, 88% 66.2%, 89% 65.2%, 90% 64.3%, 91% 63.55%, 92% 63%, 93% 62.65%, 94% 62.5%, 95% 62.55%, 96% 62.8%, 97% 63.3%, 98% 63.9%, 99% 64.75%, 100% 65.7%);
  clip-path: polygon(100% 0, 0 0, 0 77.5%, 1% 77.4%, 2% 77.1%, 3% 76.6%, 4% 75.9%, 5% 75.05%, 6% 74.05%, 7% 72.95%, 8% 71.75%, 9% 70.55%, 10% 69.3%, 11% 68.05%, 12% 66.9%, 13% 65.8%, 14% 64.8%, 15% 64%, 16% 63.35%, 17% 62.85%, 18% 62.6%, 19% 62.5%, 20% 62.65%, 21% 63%, 22% 63.5%, 23% 64.2%, 24% 65.1%, 25% 66.1%, 26% 67.2%, 27% 68.4%, 28% 69.65%, 29% 70.9%, 30% 72.15%, 31% 73.3%, 32% 74.35%, 33% 75.3%, 34% 76.1%, 35% 76.75%, 36% 77.2%, 37% 77.45%, 38% 77.5%, 39% 77.3%, 40% 76.95%, 41% 76.4%, 42% 75.65%, 43% 74.75%, 44% 73.75%, 45% 72.6%, 46% 71.4%, 47% 70.15%, 48% 68.9%, 49% 67.7%, 50% 66.55%, 51% 65.5%, 52% 64.55%, 53% 63.75%, 54% 63.15%, 55% 62.75%, 56% 62.55%, 57% 62.5%, 58% 62.7%, 59% 63.1%, 60% 63.7%, 61% 64.45%, 62% 65.4%, 63% 66.45%, 64% 67.6%, 65% 68.8%, 66% 70.05%, 67% 71.3%, 68% 72.5%, 69% 73.6%, 70% 74.65%, 71% 75.55%, 72% 76.35%, 73% 76.9%, 74% 77.3%, 75% 77.5%, 76% 77.45%, 77% 77.25%, 78% 76.8%, 79% 76.2%, 80% 75.4%, 81% 74.45%, 82% 73.4%, 83% 72.25%, 84% 71.05%, 85% 69.8%, 86% 68.55%, 87% 67.35%, 88% 66.2%, 89% 65.2%, 90% 64.3%, 91% 63.55%, 92% 63%, 93% 62.65%, 94% 62.5%, 95% 62.55%, 96% 62.8%, 97% 63.3%, 98% 63.9%, 99% 64.75%, 100% 65.7%); }

+.arrow {
+  border: solid black;
+  border-width: 0 3px 3px 0;
+  display: inline-block;
+  padding: 3px; }
+  .arrow.right {
+    transform: rotate(-45deg);
+    -webkit-transform: rotate(-45deg); }
+  .arrow.left {
+    transform: rotate(135deg);
+    -webkit-transform: rotate(135deg); }
+  .arrow.up {
+    transform: rotate(-135deg);
+    -webkit-transform: rotate(-135deg); }
+  .arrow.down {
+    transform: rotate(45deg);
+    -webkit-transform: rotate(45deg); }
+
 .button-small {
  font-size: 85%; }

@@ -277,15 +271,11 @@ footer {
 #new-version-text a {
  color: #e07171; }

-.watch-controls {
-  /* default */ }
-  .watch-controls .state-on img {
-    opacity: 0.8; }
-  .watch-controls img {
-    opacity: 0.2; }
-  .watch-controls img:hover {
-    transition: opacity 0.3s;
-    opacity: 0.8; }
+.paused-state.state-False img {
+  opacity: 0.2; }
+
+.paused-state.state-False:hover img {
+  opacity: 0.8; }

 .monospaced-textarea textarea {
  width: 100%;
@@ -545,13 +535,3 @@ ul {
  100% {
    -webkit-transform: rotate(360deg);
    transform: rotate(360deg); } }
-
-.snapshot-age {
-  padding: 4px;
-  background-color: #dfdfdf;
-  border-radius: 3px;
-  font-weight: bold;
-  margin-bottom: 4px; }
-  .snapshot-age.error {
-    background-color: #ff0000;
-    color: #fff; }
--- a/changedetectionio/static/styles/styles.scss
+++ b/changedetectionio/static/styles/styles.scss
@@ -4,8 +4,6 @@
 * nvm use v14.18.1 && npm install && npm run build
 * or npm run watch
 */
-@import "parts/_arrows.scss";
-
 body {
  color: #333;
  background: #262626;
@@ -70,17 +68,6 @@ code {

  th {
    white-space: nowrap;
-    a {
-      font-weight: normal;
-      &.active {
-        font-weight: bolder;
-      }
-      &.inactive {
-        .arrow {
-          display: none;
-        }
-      }
-    }
  }

  .title-col a[target="_blank"]::after, .current-diff-url::after {
@@ -150,6 +137,29 @@ body:after, body:before {
  clip-path: polygon(100% 0, 0 0, 0 77.5%, 1% 77.4%, 2% 77.1%, 3% 76.6%, 4% 75.9%, 5% 75.05%, 6% 74.05%, 7% 72.95%, 8% 71.75%, 9% 70.55%, 10% 69.3%, 11% 68.05%, 12% 66.9%, 13% 65.8%, 14% 64.8%, 15% 64%, 16% 63.35%, 17% 62.85%, 18% 62.6%, 19% 62.5%, 20% 62.65%, 21% 63%, 22% 63.5%, 23% 64.2%, 24% 65.1%, 25% 66.1%, 26% 67.2%, 27% 68.4%, 28% 69.65%, 29% 70.9%, 30% 72.15%, 31% 73.3%, 32% 74.35%, 33% 75.3%, 34% 76.1%, 35% 76.75%, 36% 77.2%, 37% 77.45%, 38% 77.5%, 39% 77.3%, 40% 76.95%, 41% 76.4%, 42% 75.65%, 43% 74.75%, 44% 73.75%, 45% 72.6%, 46% 71.4%, 47% 70.15%, 48% 68.9%, 49% 67.7%, 50% 66.55%, 51% 65.5%, 52% 64.55%, 53% 63.75%, 54% 63.15%, 55% 62.75%, 56% 62.55%, 57% 62.5%, 58% 62.7%, 59% 63.1%, 60% 63.7%, 61% 64.45%, 62% 65.4%, 63% 66.45%, 64% 67.6%, 65% 68.8%, 66% 70.05%, 67% 71.3%, 68% 72.5%, 69% 73.6%, 70% 74.65%, 71% 75.55%, 72% 76.35%, 73% 76.9%, 74% 77.3%, 75% 77.5%, 76% 77.45%, 77% 77.25%, 78% 76.8%, 79% 76.2%, 80% 75.4%, 81% 74.45%, 82% 73.4%, 83% 72.25%, 84% 71.05%, 85% 69.8%, 86% 68.55%, 87% 67.35%, 88% 66.2%, 89% 65.2%, 90% 64.3%, 91% 63.55%, 92% 63%, 93% 62.65%, 94% 62.5%, 95% 62.55%, 96% 62.8%, 97% 63.3%, 98% 63.9%, 99% 64.75%, 100% 65.7%)
 }

+.arrow {
+  border: solid black;
+  border-width: 0 3px 3px 0;
+  display: inline-block;
+  padding: 3px;
+    &.right {
+      transform: rotate(-45deg);
+      -webkit-transform: rotate(-45deg);
+    }
+    &.left {
+      transform: rotate(135deg);
+      -webkit-transform: rotate(135deg);
+    }
+    &.up {
+      transform: rotate(-135deg);
+      -webkit-transform: rotate(-135deg);
+    }
+    &.down {
+      transform: rotate(45deg);
+      -webkit-transform: rotate(45deg);
+    }
+}
+
 .button-small {
  font-size: 85%;
 }
@@ -352,25 +362,14 @@ footer {
  color: #e07171;
 }

-.watch-controls {
-  .state-on {
-    img {
-      opacity: 0.8;
-    }
-  }
-
-  /* default */
-  img {
+.paused-state {
+  &.state-False img {
    opacity: 0.2;
  }

-  img {
-    &:hover {
-      transition: opacity 0.3s;
-      opacity: 0.8;
-    }
+  &.state-False:hover img {
+    opacity: 0.8;
  }
-
 }

 .monospaced-textarea {
@@ -502,7 +501,6 @@ and also iPads specifically.
        vertical-align: middle;
      }
    }
-
    .last-checked::before {
      color: #555;
      content: "Last Checked ";
@@ -762,15 +760,3 @@ ul {
  }
 }

-.snapshot-age {
-  padding: 4px;
-  background-color: #dfdfdf;
-  border-radius: 3px;
-  font-weight: bold;
-  margin-bottom: 4px;
-  &.error {
-    background-color: #ff0000;
-    color: #fff;
-  }
-}
-
--- a/changedetectionio/store.py
+++ b/changedetectionio/store.py
@@ -8,7 +8,7 @@ import threading
 import time
 import uuid as uuid_builder
 from copy import deepcopy
-from os import path, unlink
+from os import mkdir, path, unlink
 from threading import Lock
 import re
 import requests
@@ -82,9 +82,8 @@ class ChangeDetectionStore:
            if include_default_watches:
                print("Creating JSON store at", self.datastore_path)

-                self.add_watch(url='http://www.quotationspage.com/random.php', tag='test')
-                self.add_watch(url='https://news.ycombinator.com/', tag='Tech news')
-                self.add_watch(url='https://changedetection.io/CHANGELOG.txt', tag='changedetection.io')
+                for i in range(50):
+                    self.add_watch(url='https://changedetection.io/CHANGELOG.txt?x='+str(i), tag='test')

        self.__data['version_tag'] = version_tag

@@ -254,6 +253,7 @@ class ChangeDetectionStore:

        self.__data['watching'][uuid].update(
            {'last_checked': 0,
+             'last_changed': 0,
             'last_viewed': 0,
             'previous_md5': False,
             'last_notification_error': False,
@@ -324,12 +324,25 @@ class ChangeDetectionStore:
            new_watch.update(apply_extras)
            self.__data['watching'][new_uuid]=new_watch

-        self.__data['watching'][new_uuid].ensure_data_dir_exists()
+        # Get the directory ready
+        output_path = "{}/{}".format(self.datastore_path, new_uuid)
+        try:
+            mkdir(output_path)
+        except FileExistsError:
+            print(output_path, "already exists.")

        if write_to_disk_now:
            self.sync_to_json()
        return new_uuid

+    def get_screenshot(self, watch_uuid):
+        output_path = "{}/{}".format(self.datastore_path, watch_uuid)
+        fname = "{}/last-screenshot.png".format(output_path)
+        if path.isfile(fname):
+            return fname
+
+        return False
+
    def visualselector_data_is_ready(self, watch_uuid):
        output_path = "{}/{}".format(self.datastore_path, watch_uuid)
        screenshot_filename = "{}/last-screenshot.png".format(output_path)
@@ -340,34 +353,17 @@ class ChangeDetectionStore:
        return False

    # Save as PNG, PNG is larger but better for doing visual diff in the future
-    def save_screenshot(self, watch_uuid, screenshot: bytes, as_error=False):
-
-        if as_error:
-            target_path = os.path.join(self.datastore_path, watch_uuid, "last-error-screenshot.png")
-        else:
-            target_path = os.path.join(self.datastore_path, watch_uuid, "last-screenshot.png")
-
-        self.data['watching'][watch_uuid].ensure_data_dir_exists()
-
-        with open(target_path, 'wb') as f:
+    def save_screenshot(self, watch_uuid, screenshot: bytes):
+        output_path = "{}/{}".format(self.datastore_path, watch_uuid)
+        fname = "{}/last-screenshot.png".format(output_path)
+        with open(fname, 'wb') as f:
            f.write(screenshot)
            f.close()

-    def save_error_text(self, watch_uuid, contents):
-
-        target_path = os.path.join(self.datastore_path, watch_uuid, "last-error.txt")
-
-        with open(target_path, 'w') as f:
-            f.write(contents)
-
-    def save_xpath_data(self, watch_uuid, data, as_error=False):
-
-        if as_error:
-            target_path = os.path.join(self.datastore_path, watch_uuid, "elements-error.json")
-        else:
-            target_path = os.path.join(self.datastore_path, watch_uuid, "elements.json")
-
-        with open(target_path, 'w') as f:
+    def save_xpath_data(self, watch_uuid, data):
+        output_path = "{}/{}".format(self.datastore_path, watch_uuid)
+        fname = "{}/elements.json".format(output_path)
+        with open(fname, 'w') as f:
            f.write(json.dumps(data))
            f.close()

@@ -524,15 +520,8 @@ class ChangeDetectionStore:

    # We incorrectly stored last_changed when there was not a change, and then confused the output list table
    def update_3(self):
-        # see https://github.com/dgtlmoon/changedetection.io/pull/835
-        return
-
-    # `last_changed` not needed, we pull that information from the history.txt index
-    def update_4(self):
        for uuid, watch in self.data['watching'].items():
-            try:
-                # Remove it from the struct
-                del(watch['last_changed'])
-            except:
-                continue
-        return
+            # Be sure it's recalculated
+            p = watch.history
+            if watch.history_n < 2:
+                watch['last_changed'] = 0
--- a/changedetectionio/templates/_pagination.jinja
+++ b/changedetectionio/templates/_pagination.jinja
@@ -1,7 +0,0 @@
-{% macro pagination(sorted_watches, total_per_page, current_page) %}
-  {{ sorted_watches|length }}
-
-  {% for row in sorted_watches|batch(total_per_page, '&nbsp;') %}
-    {{ loop.index}}
-  {% endfor %}
-{% endmacro %}
--- a/changedetectionio/templates/diff.html
+++ b/changedetectionio/templates/diff.html
@@ -3,9 +3,6 @@
 {% block content %}
 <script>
    const screenshot_url="{{url_for('static_content', group='screenshot', filename=uuid)}}";
-    {% if last_error_screenshot %}
-    const error_screenshot_url="{{url_for('static_content', group='screenshot', filename=uuid, error_screenshot=1) }}";
-    {% endif %}
 </script>
 <script type="text/javascript" src="{{url_for('static_content', group='js', filename='diff-overview.js')}}" defer></script>

@@ -46,31 +43,15 @@
 <script type="text/javascript" src="{{url_for('static_content', group='js', filename='tabs.js')}}" defer></script>
 <div class="tabs">
    <ul>
-        {% if last_error_text %}<li class="tab" id="error-text-tab"><a href="#error-text">Error Text</a></li> {% endif %}
-        {% if last_error_screenshot %}<li class="tab" id="error-screenshot-tab"><a href="#error-screenshot">Error Screenshot</a></li> {% endif %}
-        <li class="tab" id=""><a href="#text">Text</a></li>
+        <li class="tab" id="default-tab"><a href="#text">Text</a></li>
        <li class="tab" id="screenshot-tab"><a href="#screenshot">Screenshot</a></li>
    </ul>
 </div>

 <div id="diff-ui">
-    <div class="tab-pane-inner" id="error-text">
-        <div class="snapshot-age error">{{watch_a.error_text_ctime|format_seconds_ago}} seconds ago</div>
-        <pre>
-            {{ last_error_text }}
-        </pre>
-    </div>
-
-    <div class="tab-pane-inner" id="error-screenshot">
-        <div class="snapshot-age error">{{watch_a.snapshot_error_screenshot_ctime|format_seconds_ago}} seconds ago</div>
-        <img id="error-screenshot-img"  style="max-width: 80%" alt="Current error-ing screenshot from most recent request"/>
-    </div>
-
     <div class="tab-pane-inner" id="text">
         <div class="tip">Pro-tip: Use <strong>show current snapshot</strong> tab to visualise what will be ignored.
         </div>
-         <div class="snapshot-age">{{watch_a.snapshot_text_ctime|format_timestamp_timeago}}</div>
-
         <table>
             <tbody>
             <tr>
@@ -89,10 +70,10 @@
         <div class="tip">
             For now, Differences are performed on text, not graphically, only the latest screenshot is available.
         </div>
+         </br>
         {% if is_html_webdriver %}
           {% if screenshot %}
-            <div class="snapshot-age">{{watch_a.snapshot_screenshot_ctime|format_timestamp_timeago}}</div>
-            <img style="max-width: 80%" id="screenshot-img" alt="Current screenshot from most recent request"/>
+             <img style="max-width: 80%" id="screenshot-img" alt="Current screenshot from most recent request"/>
           {% else %}
              No screenshot available just yet! Try rechecking the page.
           {% endif %}
@@ -107,6 +88,7 @@

 <script defer="">

+
 var a = document.getElementById('a');
 var b = document.getElementById('b');
 var result = document.getElementById('result');
--- a/changedetectionio/templates/edit.html
+++ b/changedetectionio/templates/edit.html
@@ -23,7 +23,7 @@

    <div class="tabs collapsable">
        <ul>
-            <li class="tab" id=""><a href="#general">General</a></li>
+            <li class="tab" id="default-tab"><a href="#general">General</a></li>
            <li class="tab"><a href="#request">Request</a></li>
            <li class="tab"><a id="visualselector-tab" href="#visualselector">Visual Filter Selector</a></li>
            <li class="tab"><a href="#filters-and-triggers">Filters &amp; Triggers</a></li>
@@ -87,9 +87,6 @@
                        </span>
                    </div>
                {% endif %}
-                    <div  class="pure-control-group inline-radio">
-                        {{ render_checkbox_field(form.ignore_status_codes) }}
-                    </div>
                <fieldset id="webdriver-override-options">
                    <div class="pure-control-group">
                        {{ render_field(form.webdriver_delay) }}
@@ -131,7 +128,11 @@ User-Agent: wonderbra 1.0") }}
   \"car\":null
 }") }}
                    </div>
+                    <div id="ignore-status-codes-option">
+                        {{ render_checkbox_field(form.ignore_status_codes) }}
+                    </div>
                </fieldset>
+                <br/>
            </div>

            <div class="tab-pane-inner" id="notifications">
@@ -306,7 +307,9 @@ Unavailable") }}

            <div id="actions">
                <div class="pure-control-group">
-                    {{ render_button(form.save_button) }}
+
+                      {{ render_button(form.save_button) }} {{ render_button(form.save_and_preview_button) }}
+
                    <a href="{{url_for('form_delete', uuid=uuid)}}"
                       class="pure-button button-small button-error ">Delete</a>
                    <a href="{{url_for('clear_watch_history', uuid=uuid)}}"
--- a/changedetectionio/templates/import.html
+++ b/changedetectionio/templates/import.html
@@ -5,7 +5,7 @@

    <div class="tabs collapsable">
        <ul>
-            <li class="tab" id=""><a href="#url-list">URL List</a></li>
+            <li class="tab" id="default-tab"><a href="#url-list">URL List</a></li>
            <li class="tab"><a href="#distill-io">Distill.io</a></li>
        </ul>
    </div>
--- a/changedetectionio/templates/preview.html
+++ b/changedetectionio/templates/preview.html
@@ -3,39 +3,23 @@
 {% block content %}
 <script>
    const screenshot_url="{{url_for('static_content', group='screenshot', filename=uuid)}}";
-    {% if last_error_screenshot %}
-    const error_screenshot_url="{{url_for('static_content', group='screenshot', filename=uuid, error_screenshot=1) }}";
-    {% endif %}
 </script>
 <script type="text/javascript" src="{{url_for('static_content', group='js', filename='diff-overview.js')}}" defer></script>

+<div id="settings">
+    <h1>Current - {{watch.last_checked|format_timestamp_timeago}}</h1>
+</div>
+
 <script type="text/javascript" src="{{url_for('static_content', group='js', filename='tabs.js')}}" defer></script>
 <div class="tabs">
    <ul>
-        {% if last_error_text %}<li class="tab" id="error-text-tab"><a href="#error-text">Error Text</a></li> {% endif %}
-        {% if last_error_screenshot %}<li class="tab" id="error-screenshot-tab"><a href="#error-screenshot">Error Screenshot</a></li> {% endif %}
-        {% if history_n > 0 %}
-        <li class="tab" id="text-tab"><a href="#text">Text</a></li>
+        <li class="tab" id="default-tab"><a href="#text">Text</a></li>
        <li class="tab" id="screenshot-tab"><a href="#screenshot">Screenshot</a></li>
-        {% endif %}
    </ul>
 </div>

 <div id="diff-ui">
-    <div class="tab-pane-inner" id="error-text">
-        <div class="snapshot-age error">{{watch.error_text_ctime|format_seconds_ago}} seconds ago</div>
-        <pre>
-            {{ last_error_text }}
-        </pre>
-    </div>
-
-    <div class="tab-pane-inner" id="error-screenshot">
-        <div class="snapshot-age error">{{watch.snapshot_error_screenshot_ctime|format_seconds_ago}} seconds ago</div>
-        <img id="error-screenshot-img"  style="max-width: 80%" alt="Current erroring screenshot from most recent request"/>
-    </div>
-
    <div class="tab-pane-inner" id="text">
-        <div class="snapshot-age">{{watch.snapshot_text_ctime|format_timestamp_timeago}}</div>
        <span class="ignored">Grey lines are ignored</span> <span class="triggered">Blue lines are triggers</span>
        <table>
            <tbody>
@@ -49,7 +33,6 @@
            </tbody>
        </table>
    </div>
-
     <div class="tab-pane-inner" id="screenshot">
         <div class="tip">
             For now, Differences are performed on text, not graphically, only the latest screenshot is available.
--- a/changedetectionio/templates/settings.html
+++ b/changedetectionio/templates/settings.html
@@ -16,7 +16,7 @@
 <div class="edit-form">
    <div class="tabs collapsable">
        <ul>
-            <li class="tab" id=""><a href="#general">General</a></li>
+            <li class="tab" id="default-tab"><a href="#general">General</a></li>
            <li class="tab"><a href="#notifications">Notifications</a></li>
            <li class="tab"><a href="#fetching">Fetching</a></li>
            <li class="tab"><a href="#filters">Global Filters</a></li>
@@ -69,6 +69,12 @@
                        {{ render_checkbox_field(form.application.form.extract_title_as_title) }}
                        <span class="pure-form-message-inline">Note: This will automatically apply to all existing watches.</span>
                    </div>
+
+                    <div class="pure-control-group">
+                        {{ render_checkbox_field(form.application.form.real_browser_save_screenshot) }}
+                        <span class="pure-form-message-inline">When using a Chrome browser, a screenshot from the last check will be available on the Diff page</span>
+                    </div>
+
                    <div class="pure-control-group">
                        {{ render_checkbox_field(form.application.form.empty_pages_are_a_change) }}
                        <span class="pure-form-message-inline">When a page contains HTML, but no renderable text appears (empty page), is this considered a change?</span>
--- a/changedetectionio/templates/watch-overview.html
+++ b/changedetectionio/templates/watch-overview.html
@@ -1,7 +1,6 @@
 {% extends 'base.html' %}
 {% block content %}
 {% from '_helpers.jinja' import render_simple_field, render_field %}
-{% from '_pagination.jinja' import pagination %}
 <script type="text/javascript" src="{{url_for('static_content', group='js', filename='jquery-3.6.0.min.js')}}"></script>
 <script type="text/javascript" src="{{url_for('static_content', group='js', filename='watch-overview.js')}}" defer></script>

@@ -33,32 +32,22 @@
        {% endfor %}
    </div>

-    {% set sort_order = request.args.get('order', 'asc') == 'asc' %}
-    {% set sort_attribute = request.args.get('sort', 'last_changed')   %}
-    {% set pagination_page = request.args.get('page', 0) %}
-
    <div id="watch-table-wrapper">
        <table class="pure-table pure-table-striped watch-table">
            <thead>
            <tr>
                <th>#</th>
                <th></th>
-                {% set link_order = "desc" if sort_order else "asc" %}
-                {% set arrow_span = "" %}
-                <th><a class="{{ 'active '+link_order if sort_attribute == 'label' else 'inactive' }}" href="{{url_for('index', sort='label', order=link_order)}}">Website <span class='arrow {{link_order}}'></span></a></th>
-                <th><a class="{{ 'active '+link_order if sort_attribute == 'last_checked' else 'inactive' }}" href="{{url_for('index', sort='last_checked', order=link_order)}}">Last Checked <span class='arrow {{link_order}}'></span></a></th>
-                <th><a class="{{ 'active '+link_order if sort_attribute == 'last_changed' else 'inactive' }}" href="{{url_for('index', sort='last_changed', order=link_order)}}">Last Changed <span class='arrow {{link_order}}'></span></a></th>
+                <th></th>
+                <th>Last Checked</th>
+                <th>Last Changed</th>
                <th></th>
            </tr>
            </thead>
            <tbody>

-            {% set sorted_watches = watches|sort(attribute=sort_attribute, reverse=sort_order) %}
-            {% for watch in sorted_watches %}

-            {# WIP for pagination, disabled for now
-              {% if not ( loop.index >= 3 and loop.index <=4) %}{% continue %}{% endif %} -->
-             #}
+            {% for watch in watches|sort(attribute='last_changed', reverse=True) %}
            <tr id="{{ watch.uuid }}"
                class="{{ loop.cycle('pure-table-odd', 'pure-table-even') }}
                {% if watch.last_error is defined and watch.last_error != False %}error{% endif %}
@@ -67,10 +56,8 @@
                {% if watch.newest_history_key| int > watch.last_viewed and watch.history_n>=2 %}unviewed{% endif %}
                {% if watch.uuid in queued_uuids %}queued{% endif %}">
                <td class="inline">{{ loop.index }}</td>
-                <td class="inline watch-controls">
-                    <a class="state-{{'on' if watch.paused }}" href="{{url_for('index', op='pause', uuid=watch.uuid, tag=active_tag)}}"><img src="{{url_for('static_content', group='images', filename='pause.svg')}}" alt="Pause checks" title="Pause checks"/></a>
-                    <a class="state-{{'on' if watch.notification_muted}}" href="{{url_for('index', op='mute', uuid=watch.uuid, tag=active_tag)}}"><img src="{{url_for('static_content', group='images', filename='bell-off.svg')}}" alt="Mute notifications" title="Mute notifications"/></a>
-                </td>
+                <td class="inline paused-state state-{{watch.paused}}"><a href="{{url_for('index', pause=watch.uuid, tag=active_tag)}}"><img src="{{url_for('static_content', group='images', filename='pause.svg')}}" alt="Pause" title="Pause"/></a></td>
+
                <td class="title-col inline">{{watch.title if watch.title is not none and watch.title|length > 0 else watch.url}}
                    <a class="external" target="_blank" rel="noopener" href="{{ watch.url.replace('source:','') }}"></a>
                    <a href="{{url_for('form_share_put_watch', uuid=watch.uuid)}}"><img style="height: 1em;display:inline-block;" src="{{url_for('static_content', group='images', filename='spread.svg')}}" /></a>
@@ -101,7 +88,7 @@
                    {% if watch.history_n >= 2 %}
                    <a href="{{ url_for('diff_history_page', uuid=watch.uuid) }}" target="{{watch.uuid}}" class="pure-button button-small pure-button-primary diff-link">Diff</a>
                    {% else %}
-                        {% if watch.history_n == 1 or (watch.history_n ==0 and watch.error_text_ctime )%}
+                        {% if watch.history_n == 1 %}
                            <a href="{{ url_for('preview_page', uuid=watch.uuid)}}" target="{{watch.uuid}}" class="pure-button button-small pure-button-primary">Preview</a>
                        {% endif %}
                    {% endif %}
@@ -124,10 +111,6 @@
                <a href="{{ url_for('rss', tag=active_tag , token=app_rss_token)}}"><img alt="RSS Feed" id="feed-icon" src="{{url_for('static_content', group='images', filename='Generic_Feed-icon.svg')}}" height="15"></a>
            </li>
        </ul>
-        {# WIP for pagination, disabled for now
-         {{ pagination(sorted_watches,3, pagination_page) }}
-         #}
-
    </div>
 </div>
 {% endblock %}
--- a/changedetectionio/tests/fetchers/test_content.py
+++ b/changedetectionio/tests/fetchers/test_content.py
@@ -2,7 +2,7 @@

 import time
 from flask import url_for
-from ..util import live_server_setup, wait_for_all_checks
+from ..util import live_server_setup
 import logging


@@ -29,8 +29,14 @@ def test_fetch_webdriver_content(client, live_server):

    assert b"1 Imported" in res.data
    time.sleep(3)
-
-    wait_for_all_checks(client)
+    attempt = 0
+    while attempt < 20:
+        res = client.get(url_for("index"))
+        if not b'Checking now' in res.data:
+            break
+        logging.getLogger().info("Waiting for check to not say 'Checking now'..")
+        time.sleep(3)
+        attempt += 1


    res = client.get(
--- a/changedetectionio/tests/test_access_control.py
+++ b/changedetectionio/tests/test_access_control.py
@@ -19,6 +19,7 @@ def test_check_access_control(app, client):
        )

        assert b"Password protection enabled." in res.data
+        assert b"LOG OUT" not in res.data

        # Check we hit the login
        res = c.get(url_for("index"), follow_redirects=True)
@@ -37,40 +38,7 @@ def test_check_access_control(app, client):
            follow_redirects=True
        )

-        # Yes we are correctly logged in
        assert b"LOG OUT" in res.data
-
-        # 598 - Password should be set and not accidently removed
-        res = c.post(
-            url_for("settings_page"),
-            data={
-                  "requests-time_between_check-minutes": 180,
-                  'application-fetch_backend': "html_requests"},
-            follow_redirects=True
-        )
-
-        res = c.get(url_for("logout"),
-            follow_redirects=True)
-
-        res = c.get(url_for("settings_page"),
-            follow_redirects=True)
-
-
-        assert b"Login" in res.data
-
-        res = c.get(url_for("login"))
-        assert b"Login" in res.data
-
-
-        res = c.post(
-            url_for("login"),
-            data={"password": "foobar"},
-            follow_redirects=True
-        )
-
-        # Yes we are correctly logged in
-        assert b"LOG OUT" in res.data
-
        res = c.get(url_for("settings_page"))

        # Menu should be available now
--- a/changedetectionio/tests/test_backend.py
+++ b/changedetectionio/tests/test_backend.py
@@ -90,14 +90,6 @@ def test_check_basic_change_detection_functionality(client, live_server):
    res = client.get(url_for("diff_history_page", uuid="first"))
    assert b'Compare newest' in res.data

-    # Check the [preview] pulls the right one
-    res = client.get(
-        url_for("preview_page", uuid="first"),
-        follow_redirects=True
-    )
-    assert b'which has this one new line' in res.data
-    assert b'Which is across multiple lines' not in res.data
-
    time.sleep(2)

    # Do this a few times.. ensures we dont accidently set the status
--- a/changedetectionio/tests/test_errorhandling.py
+++ b/changedetectionio/tests/test_errorhandling.py
@@ -11,17 +11,16 @@ def test_setup(live_server):
    live_server_setup(live_server)


-def _runner_test_http_errors(client, live_server, http_code, expected_text):
+def test_error_handler(client, live_server):

-    with open("test-datastore/endpoint-content.txt", "w") as f:
-        f.write("Now you going to get a {} error code\n".format(http_code))

+    # Give the endpoint time to spin up
+    time.sleep(1)

    # Add our URL to the import page
    test_url = url_for('test_endpoint',
-                       status_code=http_code,
+                       status_code=403,
                       _external=True)
-
    res = client.post(
        url_for("import_page"),
        data={"urls": test_url},
@@ -29,39 +28,20 @@ def _runner_test_http_errors(client, live_server, http_code, expected_text):
    )
    assert b"1 Imported" in res.data

+    # Trigger a check
+    client.get(url_for("form_watch_checknow"), follow_redirects=True)
+
    # Give the thread time to pick it up
-    time.sleep(2)
+    time.sleep(3)
+

    res = client.get(url_for("index"))
-    # no change
    assert b'unviewed' not in res.data
-    assert bytes(expected_text.encode('utf-8')) in res.data
-
-
-    # Error viewing tabs should appear
-    res = client.get(
-        url_for("preview_page", uuid="first"),
-        follow_redirects=True
-    )
-
-    assert b'Error Text' in res.data
-
-    # 'Error Screenshot' only when in playwright mode
-    #assert b'Error Screenshot' in res.data
-
-
-    res = client.get(url_for("form_delete", uuid="all"), follow_redirects=True)
-    assert b'Deleted' in res.data
-
-
-def test_http_error_handler(client, live_server):
-    _runner_test_http_errors(client, live_server, 403, 'Access denied')
-    _runner_test_http_errors(client, live_server, 404, 'Page not found')
-    _runner_test_http_errors(client, live_server, 500, '(Internal server Error) received')
-    _runner_test_http_errors(client, live_server, 400, 'Error - Request returned a HTTP error code 400')
+    assert b'Status Code 403' in res.data
+    assert bytes("just now".encode('utf-8')) in res.data

 # Just to be sure error text is properly handled
-def test_DNS_errors(client, live_server):
+def test_error_text_handler(client, live_server):
    # Give the endpoint time to spin up
    time.sleep(1)

@@ -73,11 +53,13 @@ def test_DNS_errors(client, live_server):
    )
    assert b"1 Imported" in res.data

+    # Trigger a check
+    client.get(url_for("form_watch_checknow"), follow_redirects=True)
+
    # Give the thread time to pick it up
    time.sleep(3)

    res = client.get(url_for("index"))
    assert b'Name or service not known' in res.data
-    # Should always record that we tried
    assert bytes("just now".encode('utf-8')) in res.data

--- a/changedetectionio/tests/test_filter_exist_changes.py
+++ b/changedetectionio/tests/test_filter_exist_changes.py
@@ -1,134 +0,0 @@
-#!/usr/bin/python3
-
-# https://www.reddit.com/r/selfhosted/comments/wa89kp/comment/ii3a4g7/?context=3
-import os
-import time
-from flask import url_for
-from .util import set_original_response, live_server_setup
-from changedetectionio.model import App
-
-
-def set_response_without_filter():
-    test_return_data = """<html>
-       <body>
-     Some initial text</br>
-     <p>Which is across multiple lines</p>
-     </br>
-     So let's see what happens.  </br>
-     <div id="nope-doesnt-exist">Some text thats the same</div>     
-     </body>
-     </html>
-    """
-
-    with open("test-datastore/endpoint-content.txt", "w") as f:
-        f.write(test_return_data)
-    return None
-
-
-def set_response_with_filter():
-    test_return_data = """<html>
-       <body>
-     Some initial text</br>
-     <p>Which is across multiple lines</p>
-     </br>
-     So let's see what happens.  </br>
-     <div class="ticket-available">Ticket now on sale!</div>     
-     </body>
-     </html>
-    """
-
-    with open("test-datastore/endpoint-content.txt", "w") as f:
-        f.write(test_return_data)
-    return None
-
-def test_filter_doesnt_exist_then_exists_should_get_notification(client, live_server):
-#  Filter knowingly doesn't exist, like someone setting up a known filter to see if some cinema tickets are on sale again
-#  And the page has that filter available
-#  Then I should get a notification
-
-    live_server_setup(live_server)
-
-    # Give the endpoint time to spin up
-    time.sleep(1)
-    set_response_without_filter()
-
-    # Add our URL to the import page
-    test_url = url_for('test_endpoint', _external=True)
-    res = client.post(
-        url_for("form_quick_watch_add"),
-        data={"url": test_url, "tag": 'cinema'},
-        follow_redirects=True
-    )
-    assert b"Watch added" in res.data
-
-    # Give the thread time to pick up the first version
-    time.sleep(3)
-
-    # Goto the edit page, add our ignore text
-    # Add our URL to the import page
-    url = url_for('test_notification_endpoint', _external=True)
-    notification_url = url.replace('http', 'json')
-
-    print(">>>> Notification URL: " + notification_url)
-
-    # Just a regular notification setting, this will be used by the special 'filter not found' notification
-    notification_form_data = {"notification_urls": notification_url,
-                              "notification_title": "New ChangeDetection.io Notification - {watch_url}",
-                              "notification_body": "BASE URL: {base_url}\n"
-                                                   "Watch URL: {watch_url}\n"
-                                                   "Watch UUID: {watch_uuid}\n"
-                                                   "Watch title: {watch_title}\n"
-                                                   "Watch tag: {watch_tag}\n"
-                                                   "Preview: {preview_url}\n"
-                                                   "Diff URL: {diff_url}\n"
-                                                   "Snapshot: {current_snapshot}\n"
-                                                   "Diff: {diff}\n"
-                                                   "Diff Full: {diff_full}\n"
-                                                   ":-)",
-                              "notification_format": "Text"}
-
-    notification_form_data.update({
-        "url": test_url,
-        "tag": "my tag",
-        "title": "my title",
-        "headers": "",
-        "css_filter": '.ticket-available',
-        "fetch_backend": "html_requests"})
-
-    res = client.post(
-        url_for("edit_page", uuid="first"),
-        data=notification_form_data,
-        follow_redirects=True
-    )
-    assert b"Updated watch." in res.data
-    time.sleep(3)
-
-    # Shouldn't exist, shouldn't have fired
-    assert not os.path.isfile("test-datastore/notification.txt")
-    # Now the filter should exist
-    set_response_with_filter()
-    client.get(url_for("form_watch_checknow"), follow_redirects=True)
-    time.sleep(3)
-
-    assert os.path.isfile("test-datastore/notification.txt")
-
-    with open("test-datastore/notification.txt", 'r') as f:
-        notification = f.read()
-
-    assert 'Ticket now on sale' in notification
-    os.unlink("test-datastore/notification.txt")
-
-
-    # Test that if it gets removed, then re-added, we get a notification
-    # Remove the target and re-add it, we should get a new notification
-    set_response_without_filter()
-    client.get(url_for("form_watch_checknow"), follow_redirects=True)
-    time.sleep(3)
-    assert not os.path.isfile("test-datastore/notification.txt")
-
-    set_response_with_filter()
-    client.get(url_for("form_watch_checknow"), follow_redirects=True)
-    time.sleep(3)
-    assert os.path.isfile("test-datastore/notification.txt")
-
-# Also test that the filter was updated after the first one was requested
--- a/changedetectionio/tests/test_filter_failure_notification.py
+++ b/changedetectionio/tests/test_filter_failure_notification.py
@@ -26,13 +26,6 @@ def run_filter_test(client, content_filter):

    # Give the endpoint time to spin up
    time.sleep(1)
-    # cleanup for the next
-    client.get(
-        url_for("form_delete", uuid="all"),
-        follow_redirects=True
-    )
-    if os.path.isfile("test-datastore/notification.txt"):
-        os.unlink("test-datastore/notification.txt")

    # Add our URL to the import page
    test_url = url_for('test_endpoint', _external=True)
@@ -41,7 +34,6 @@ def run_filter_test(client, content_filter):
        data={"url": test_url, "tag": ''},
        follow_redirects=True
    )
-
    assert b"Watch added" in res.data

    # Give the thread time to pick up the first version
@@ -75,7 +67,6 @@ def run_filter_test(client, content_filter):
        "tag": "my tag",
        "title": "my title",
        "headers": "",
-        "filter_failure_notification_send": 'y',
        "css_filter": content_filter,
        "fetch_backend": "html_requests"})

@@ -95,7 +86,7 @@ def run_filter_test(client, content_filter):
        time.sleep(3)

    # We should see something in the frontend
-    assert b'Warning, filter' in res.data
+    assert b'Did the page change its layout' in res.data

    # Now it should exist and contain our "filter not found" alert
    assert os.path.isfile("test-datastore/notification.txt")
@@ -141,4 +132,3 @@ def test_check_xpath_filter_failure_notification(client, live_server):
    time.sleep(1)
    run_filter_test(client, '//*[@id="nope-doesnt-exist"]')

-# Test that notification is never sent
--- a/changedetectionio/tests/test_ignorestatuscode.py
+++ b/changedetectionio/tests/test_ignorestatuscode.py
@@ -137,3 +137,54 @@ def test_403_page_check_works_with_ignore_status_code(client, live_server):
    res = client.get(url_for("index"))
    assert b'unviewed' in res.data

+
+# Tests the whole stack works with staus codes ignored
+def test_403_page_check_fails_without_ignore_status_code(client, live_server):
+    sleep_time_for_fetch_thread = 3
+
+    set_original_response()
+
+    # Give the endpoint time to spin up
+    time.sleep(1)
+
+    # Add our URL to the import page
+    test_url = url_for('test_endpoint', status_code=403, _external=True)
+    res = client.post(
+        url_for("import_page"),
+        data={"urls": test_url},
+        follow_redirects=True
+    )
+    assert b"1 Imported" in res.data
+
+    # Trigger a check
+    client.get(url_for("form_watch_checknow"), follow_redirects=True)
+
+    # Give the thread time to pick it up
+    time.sleep(sleep_time_for_fetch_thread)
+
+    # Goto the edit page, check our ignore option
+    # Add our URL to the import page
+    res = client.post(
+        url_for("edit_page", uuid="first"),
+        data={"url": test_url, "tag": "", "headers": "", 'fetch_backend': "html_requests"},
+        follow_redirects=True
+    )
+    assert b"Updated watch." in res.data
+
+    # Trigger a check
+    client.get(url_for("form_watch_checknow"), follow_redirects=True)
+
+    # Give the thread time to pick it up
+    time.sleep(sleep_time_for_fetch_thread)
+    #  Make a change
+    set_some_changed_response()
+
+    # Trigger a check
+    client.get(url_for("form_watch_checknow"), follow_redirects=True)
+    # Give the thread time to pick it up
+    time.sleep(sleep_time_for_fetch_thread)
+
+    # It should have 'unviewed' still
+    # Because it should be looking at only that 'sametext' id
+    res = client.get(url_for("index"))
+    assert b'Status Code 403' in res.data
--- a/changedetectionio/tests/util.py
+++ b/changedetectionio/tests/util.py
@@ -2,8 +2,6 @@

 from flask import make_response, request
 from flask import url_for
-import logging
-import time

 def set_original_response():
    test_return_data = """<html>
@@ -70,31 +68,6 @@ def extract_api_key_from_UI(client):
    api_key = m.group(1)
    return api_key.strip()

-
-# kinda funky, but works for now
-def extract_UUID_from_client(client):
-    import re
-    res = client.get(
-        url_for("index"),
-    )
-    # <span id="api-key">{{api_key}}</span>
-
-    m = re.search('edit/(.+?)"', str(res.data))
-    uuid = m.group(1)
-    return uuid.strip()
-
-def wait_for_all_checks(client):
-    # Loop waiting until done..
-    attempt=0
-    while attempt < 60:
-        time.sleep(1)
-        res = client.get(url_for("index"))
-        if not b'Checking now' in res.data:
-            break
-        logging.getLogger().info("Waiting for watch-list to not say 'Checking now'.. {}".format(attempt))
-
-        attempt += 1
-
 def live_server_setup(live_server):

    @live_server.app.route('/test-endpoint')
@@ -160,4 +133,3 @@ def live_server_setup(live_server):
        return ret

    live_server.start()
-
--- a/changedetectionio/tests/visualselector/init.py
+++ b/changedetectionio/tests/visualselector/init.py
@@ -1,2 +0,0 @@
-"""Tests for the app."""
-
--- a/changedetectionio/tests/visualselector/conftest.py
+++ b/changedetectionio/tests/visualselector/conftest.py
@@ -1,3 +0,0 @@
-#!/usr/bin/python3
-
-from .. import conftest
--- a/changedetectionio/tests/visualselector/test_fetch_data.py
+++ b/changedetectionio/tests/visualselector/test_fetch_data.py
@@ -1,35 +0,0 @@
-#!/usr/bin/python3
-
-import time
-from flask import url_for
-from ..util import live_server_setup, wait_for_all_checks, extract_UUID_from_client
-
-# Add a site in paused mode, add an invalid filter, we should still have visual selector data ready
-def test_visual_selector_content_ready(client, live_server):
-    import os
-
-    assert os.getenv('PLAYWRIGHT_DRIVER_URL'), "Needs PLAYWRIGHT_DRIVER_URL set for this test"
-    live_server_setup(live_server)
-    time.sleep(1)
-
-    # Add our URL to the import page, maybe better to use something we control?
-    # We use an external URL because the docker container is too difficult to setup to connect back to the pytest socket
-    test_url = 'https://news.ycombinator.com'
-    res = client.post(
-        url_for("form_quick_watch_add"),
-        data={"url": test_url, "tag": '', 'edit_and_watch_submit_button': 'Edit > Watch'},
-        follow_redirects=True
-    )
-    assert b"Watch added in Paused state, saving will unpause" in res.data
-
-    res = client.post(
-        url_for("edit_page", uuid="first", unpause_on_save=1),
-        data={"css_filter": ".does-not-exist", "url": test_url, "tag": "", "headers": "", 'fetch_backend': "html_webdriver"},
-        follow_redirects=True
-    )
-    assert b"unpaused" in res.data
-    time.sleep(1)
-    wait_for_all_checks(client)
-    uuid = extract_UUID_from_client(client)
-    assert os.path.isfile(os.path.join('test-datastore', uuid, 'last-screenshot.png')), "last-screenshot.png should exist"
-    assert os.path.isfile(os.path.join('test-datastore', uuid, 'elements.json')), "xpath elements.json data should exist"
--- a/changedetectionio/update_worker.py
+++ b/changedetectionio/update_worker.py
@@ -1,4 +1,3 @@
-import os
 import threading
 import queue
 import time
@@ -22,70 +21,10 @@ class update_worker(threading.Thread):
        self.datastore = datastore
        super().__init__(*args, **kwargs)

-    def send_content_changed_notification(self, t, watch_uuid):
-
-        from changedetectionio import diff
-
-        n_object = {}
-        watch = self.datastore.data['watching'].get(watch_uuid, False)
-        if not watch:
-            return
-
-        watch_history = watch.history
-        dates = list(watch_history.keys())
-        # Theoretically it's possible that this could be just 1 long,
-        # - In the case that the timestamp key was not unique
-        if len(dates) == 1:
-            raise ValueError(
-                "History index had 2 or more, but only 1 date loaded, timestamps were not unique? maybe two of the same timestamps got written, needs more delay?"
-            )
-
-        # Did it have any notification alerts to hit?
-        if len(watch['notification_urls']):
-            print(">>> Notifications queued for UUID from watch {}".format(watch_uuid))
-            n_object['notification_urls'] = watch['notification_urls']
-            n_object['notification_title'] = watch['notification_title']
-            n_object['notification_body'] = watch['notification_body']
-            n_object['notification_format'] = watch['notification_format']
-
-        # No? maybe theres a global setting, queue them all
-        elif len(self.datastore.data['settings']['application']['notification_urls']):
-            print(">>> Watch notification URLs were empty, using GLOBAL notifications for UUID: {}".format(watch_uuid))
-            n_object['notification_urls'] = self.datastore.data['settings']['application']['notification_urls']
-            n_object['notification_title'] = self.datastore.data['settings']['application']['notification_title']
-            n_object['notification_body'] = self.datastore.data['settings']['application']['notification_body']
-            n_object['notification_format'] = self.datastore.data['settings']['application']['notification_format']
-        else:
-            print(">>> NO notifications queued, watch and global notification URLs were empty.")
-
-        # Only prepare to notify if the rules above matched
-        if 'notification_urls' in n_object:
-            # HTML needs linebreak, but MarkDown and Text can use a linefeed
-            if n_object['notification_format'] == 'HTML':
-                line_feed_sep = "</br>"
-            else:
-                line_feed_sep = "\n"
-
-            snapshot_contents = ''
-            with open(watch_history[dates[-1]], 'rb') as f:
-                snapshot_contents = f.read()
-
-            n_object.update({
-                'watch_url': watch['url'],
-                'uuid': watch_uuid,
-                'current_snapshot': snapshot_contents.decode('utf-8'),
-                'diff': diff.render_diff(watch_history[dates[-2]], watch_history[dates[-1]], line_feed_sep=line_feed_sep),
-                'diff_full': diff.render_diff(watch_history[dates[-2]], watch_history[dates[-1]], True, line_feed_sep=line_feed_sep)
-            })
-
-            self.notification_q.put(n_object)
-
-    def send_filter_failure_notification(self, watch_uuid):
+    def send_filter_failure_notification(self, uuid):

        threshold = self.datastore.data['settings']['application'].get('filter_failure_notification_threshold_attempts')
-        watch = self.datastore.data['watching'].get(watch_uuid, False)
-        if not watch:
-            return
+        watch = self.datastore.data['watching'].get(uuid, False)

        n_object = {'notification_title': 'Changedetection.io - Alert - CSS/xPath filter was not present in the page',
                    'notification_body': "Your configured CSS/xPath filter of '{}' for {{watch_url}} did not appear on the page after {} attempts, did the page change layout?\n\nLink: {{base_url}}/edit/{{watch_uuid}}\n\nThanks - Your omniscient changedetection.io installation :)\n".format(
@@ -103,18 +42,10 @@ class update_worker(threading.Thread):
        if 'notification_urls' in n_object:
            n_object.update({
                'watch_url': watch['url'],
-                'uuid': watch_uuid
+                'uuid': uuid
            })
            self.notification_q.put(n_object)
-            print("Sent filter not found notification for {}".format(watch_uuid))
-
-    def cleanup_error_artifacts(self, uuid):
-        # All went fine, remove error artifacts
-        cleanup_files = ["last-error-screenshot.png", "last-error.txt"]
-        for f in cleanup_files:
-            full_path = os.path.join(self.datastore.datastore_path, uuid, f)
-            if os.path.isfile(full_path):
-                os.unlink(full_path)
+            print("Sent filter not found notification for {}".format(uuid))

    def run(self):
        from changedetectionio import fetch_site_status
@@ -124,7 +55,7 @@ class update_worker(threading.Thread):
        while not self.app.config.exit.is_set():

            try:
-                priority, uuid = self.q.get(block=False)
+                uuid = self.q.get(block=False)
            except queue.Empty:
                pass

@@ -132,17 +63,16 @@ class update_worker(threading.Thread):
                self.current_uuid = uuid

                if uuid in list(self.datastore.data['watching'].keys()):
+
                    changed_detected = False
-                    contents = b''
+                    contents = ""
                    screenshot = False
                    update_obj= {}
                    xpath_data = False
-                    process_changedetection_results = True
-                    print("> Processing UUID {} Priority {} URL {}".format(uuid, priority, self.datastore.data['watching'][uuid]['url']))
                    now = time.time()

                    try:
-                        changed_detected, update_obj, contents = update_handler.run(uuid)
+                        changed_detected, update_obj, contents, screenshot, xpath_data = update_handler.run(uuid)
                        # Re #342
                        # In Python 3, all strings are sequences of Unicode characters. There is a bytes type that holds raw bytes.
                        # We then convert/.decode('utf-8') for the notification etc
@@ -150,61 +80,26 @@ class update_worker(threading.Thread):
                            raise Exception("Error - returned data from the fetch handler SHOULD be bytes")
                    except PermissionError as e:
                        self.app.logger.error("File permission error updating", uuid, str(e))
-                        process_changedetection_results = False
                    except content_fetcher.ReplyWithContentButNoText as e:
                        # Totally fine, it's by choice - just continue on, nothing more to care about
                        # Page had elements/content but no renderable text
-                        # Backend (not filters) gave zero output
-                        self.datastore.update_watch(uuid=uuid, update_obj={'last_error': "Got HTML content but no text found (With {} reply code).".format(e.status_code)})
-                        if e.screenshot:
-                            self.datastore.save_screenshot(watch_uuid=uuid, screenshot=e.screenshot)
-                        process_changedetection_results = False
-
-                    except content_fetcher.Non200ErrorCodeReceived as e:
-                        if e.status_code == 403:
-                            err_text = "Error - 403 (Access denied) received"
-                        elif e.status_code == 404:
-                            err_text = "Error - 404 (Page not found) received"
-                        elif e.status_code == 500:
-                            err_text = "Error - 500 (Internal server Error) received"
-                        else:
-                            err_text = "Error - Request returned a HTTP error code {}".format(str(e.status_code))
-
-                        if e.screenshot:
-                            self.datastore.save_screenshot(watch_uuid=uuid, screenshot=e.screenshot, as_error=True)
-                        if e.xpath_data:
-                            self.datastore.save_xpath_data(watch_uuid=uuid, data=e.xpath_data, as_error=True)
-                        if e.page_text:
-                            self.datastore.save_error_text(watch_uuid=uuid, contents=e.page_text)
-
-                        self.datastore.update_watch(uuid=uuid, update_obj={'last_error': err_text,
-                                                                           # So that we get a trigger when the content is added again
-                                                                           'previous_md5': ''})
-                        process_changedetection_results = False
-
+                        self.datastore.update_watch(uuid=uuid, update_obj={'last_error': "Got HTML content but no text found."})
                    except FilterNotFoundInResponse as e:
-                        err_text = "Warning, filter '{}' not found".format(str(e))
-                        self.datastore.update_watch(uuid=uuid, update_obj={'last_error': err_text,
-                                                                           # So that we get a trigger when the content is added again
-                                                                           'previous_md5': ''})
-
-                        # Only when enabled, send the notification
-                        if self.datastore.data['watching'][uuid].get('filter_failure_notification_send', False):
+                        err_text = "Filter '{}' not found - Did the page change its layout?".format(str(e))
+                        c = 0
+                        if self.datastore.data['watching'].get(uuid, False):
                            c = self.datastore.data['watching'][uuid].get('consecutive_filter_failures', 5)
-                            c += 1
-                            # Send notification if we reached the threshold?
-                            threshold = self.datastore.data['settings']['application'].get('filter_failure_notification_threshold_attempts',
-                                                                                           0)
-                            print("Filter for {} not found, consecutive_filter_failures: {}".format(uuid, c))
-                            if threshold > 0 and c >= threshold:
-                                if not self.datastore.data['watching'][uuid].get('notification_muted'):
-                                    self.send_filter_failure_notification(uuid)
-                                c = 0
+                        c += 1

-                            self.datastore.update_watch(uuid=uuid, update_obj={'consecutive_filter_failures': c})
-
-                        process_changedetection_results = True
+                        # Send notification if we reached the threshold?
+                        threshold = self.datastore.data['settings']['application'].get('filter_failure_notification_threshold_attempts', 0)
+                        print("Filter for {} not found, consecutive_filter_failures: {}".format(uuid, c))
+                        if threshold >0 and c >= threshold:
+                            self.send_filter_failure_notification(uuid)
+                            c = 0

+                        self.datastore.update_watch(uuid=uuid, update_obj={'last_error': err_text,
+                                                                           'consecutive_filter_failures': c})
                    except content_fetcher.EmptyReply as e:
                        # Some kind of custom to-str handler in the exception handler that does this?
                        err_text = "EmptyReply - try increasing 'Wait seconds before extracting text', Status Code {}".format(e.status_code)
@@ -214,40 +109,15 @@ class update_worker(threading.Thread):
                        err_text = "Screenshot unavailable, page did not render fully in the expected time - try increasing 'Wait seconds before extracting text'"
                        self.datastore.update_watch(uuid=uuid, update_obj={'last_error': err_text,
                                                                           'last_check_status': e.status_code})
-                        process_changedetection_results = False
-                    except content_fetcher.JSActionExceptions as e:
-                        err_text = "Error running JS Actions - Page request - "+e.message
-                        if e.screenshot:
-                            self.datastore.save_screenshot(watch_uuid=uuid, screenshot=e.screenshot, as_error=True)
-                        self.datastore.update_watch(uuid=uuid, update_obj={'last_error': err_text,
-                                                                           'last_check_status': e.status_code})
                    except content_fetcher.PageUnloadable as e:
-                        # @todo connection-refused ?
                        err_text = "Page request from server didnt respond correctly"
-                        if e.screenshot:
-                            self.datastore.save_screenshot(watch_uuid=uuid, screenshot=e.screenshot, as_error=True)
-
                        self.datastore.update_watch(uuid=uuid, update_obj={'last_error': err_text,
                                                                           'last_check_status': e.status_code})
                    except Exception as e:
                        self.app.logger.error("Exception reached processing watch UUID: %s - %s", uuid, str(e))
                        self.datastore.update_watch(uuid=uuid, update_obj={'last_error': str(e)})
-                        # Other serious error
-                        process_changedetection_results = False
+
                    else:
-
-                        # Mark that we never had any failures
-                        if not self.datastore.data['watching'][uuid].get('ignore_status_codes'):
-                            update_obj['consecutive_filter_failures'] = 0
-
-                        self.cleanup_error_artifacts(uuid)
-
-                    # Crash protection, the watch entry could have been removed by this point (during a slow chrome fetch etc)
-                    if not self.datastore.data['watching'].get(uuid):
-                        continue
-
-                    # Different exceptions mean that we may or may not want to bump the snapshot, trigger notifications etc
-                    if process_changedetection_results:
                        try:
                            watch = self.datastore.data['watching'][uuid]
                            fname = "" # Saved history text filename
@@ -255,19 +125,68 @@ class update_worker(threading.Thread):
                            # For the FIRST time we check a site, or a change detected, save the snapshot.
                            if changed_detected or not watch['last_checked']:
                                # A change was detected
-                                watch.save_history_text(contents=contents, timestamp=str(round(time.time())))
+                                fname = watch.save_history_text(contents=contents, timestamp=str(round(time.time())))

+                            # Generally update anything interesting returned
+                            update_obj['consecutive_filter_failures'] = 0
                            self.datastore.update_watch(uuid=uuid, update_obj=update_obj)

                            # A change was detected
                            if changed_detected:
+                                n_object = {}
                                print (">> Change detected in UUID {} - {}".format(uuid, watch['url']))

                                # Notifications should only trigger on the second time (first time, we gather the initial snapshot)
                                if watch.history_n >= 2:
-                                    if not self.datastore.data['watching'][uuid].get('notification_muted'):
-                                        self.send_content_changed_notification(self, watch_uuid=uuid)
+                                    # Atleast 2, means there really was a change
+                                    self.datastore.update_watch(uuid=uuid, update_obj={'last_changed': round(now)})

+                                    watch_history = watch.history
+                                    dates = list(watch_history.keys())
+                                    # Theoretically it's possible that this could be just 1 long,
+                                    # - In the case that the timestamp key was not unique
+                                    if len(dates) == 1:
+                                        raise ValueError(
+                                            "History index had 2 or more, but only 1 date loaded, timestamps were not unique? maybe two of the same timestamps got written, needs more delay?"
+                                        )
+                                    prev_fname = watch_history[dates[-2]]
+
+                                    # Did it have any notification alerts to hit?
+                                    if len(watch['notification_urls']):
+                                        print(">>> Notifications queued for UUID from watch {}".format(uuid))
+                                        n_object['notification_urls'] = watch['notification_urls']
+                                        n_object['notification_title'] = watch['notification_title']
+                                        n_object['notification_body'] = watch['notification_body']
+                                        n_object['notification_format'] = watch['notification_format']
+
+                                    # No? maybe theres a global setting, queue them all
+                                    elif len(self.datastore.data['settings']['application']['notification_urls']):
+                                        print(">>> Watch notification URLs were empty, using GLOBAL notifications for UUID: {}".format(uuid))
+                                        n_object['notification_urls'] = self.datastore.data['settings']['application']['notification_urls']
+                                        n_object['notification_title'] = self.datastore.data['settings']['application']['notification_title']
+                                        n_object['notification_body'] = self.datastore.data['settings']['application']['notification_body']
+                                        n_object['notification_format'] = self.datastore.data['settings']['application']['notification_format']
+                                    else:
+                                        print(">>> NO notifications queued, watch and global notification URLs were empty.")
+
+                                    # Only prepare to notify if the rules above matched
+                                    if 'notification_urls' in n_object:
+                                        # HTML needs linebreak, but MarkDown and Text can use a linefeed
+                                        if n_object['notification_format'] == 'HTML':
+                                            line_feed_sep = "</br>"
+                                        else:
+                                            line_feed_sep = "\n"
+
+                                        from changedetectionio import diff
+                                        n_object.update({
+                                            'watch_url': watch['url'],
+                                            'uuid': uuid,
+                                            'current_snapshot': contents.decode('utf-8'),
+                                            'diff': diff.render_diff(prev_fname, fname, line_feed_sep=line_feed_sep),
+                                            'diff_full': diff.render_diff(prev_fname, fname, True, line_feed_sep=line_feed_sep)
+                                        })
+
+                                        self.notification_q.put(n_object)

                        except Exception as e:
                            # Catch everything possible here, so that if a worker crashes, we don't lose it until restart!
@@ -275,16 +194,16 @@ class update_worker(threading.Thread):
                            self.app.logger.error("Exception reached processing watch UUID: %s - %s", uuid, str(e))
                            self.datastore.update_watch(uuid=uuid, update_obj={'last_error': str(e)})

+                    finally:
+                        # Always record that we atleast tried
+                        self.datastore.update_watch(uuid=uuid, update_obj={'fetch_time': round(time.time() - now, 3),
+                                                                           'last_checked': round(time.time())})

-                    # Always record that we atleast tried
-                    self.datastore.update_watch(uuid=uuid, update_obj={'fetch_time': round(time.time() - now, 3),
-                                                                       'last_checked': round(time.time())})
-
-                    # Always save the screenshot if it's available
-                    if update_handler.screenshot:
-                        self.datastore.save_screenshot(watch_uuid=uuid, screenshot=update_handler.screenshot)
-                    if update_handler.xpath_data:
-                        self.datastore.save_xpath_data(watch_uuid=uuid, data=update_handler.xpath_data)
+                        # Always save the screenshot if it's available
+                        if screenshot:
+                            self.datastore.save_screenshot(watch_uuid=uuid, screenshot=screenshot)
+                        if xpath_data:
+                            self.datastore.save_xpath_data(watch_uuid=uuid, data=xpath_data)


                self.current_uuid = None  # Done
--- a/memory-leak.html
+++ b/memory-leak.html
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,7 +18,7 @@ wtforms ~= 3.0
 jsonpath-ng ~= 1.5.3

 # Notification library
-apprise ~= 1.0.0
+apprise ~= 0.9.9

 # apprise mqtt https://github.com/dgtlmoon/changedetection.io/issues/315
 paho-mqtt