diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ea1472e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+output/
diff --git a/README.md b/README.md
index 9fd384f..983035b 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,30 @@
+### Updated Documentation for crt.sh v2.1 ([@TheArqsz](https://github.com/TheArqsz))
+
+The logic of the script was changed a little bit so one can use it more freely in the automated environment and it aligns more with popular security tools.
+
+Updated usage:
+
+```bash
+A script to query the crt.sh certificate transparency log.
+
+Usage: ./crt_v2.1.sh [OPTIONS]
+
+Options:
+  -d, --domain <domain>        Search for a specific domain name (e.g., hackerone.com)
+      --org <organization>     Search for a specific organization name (e.g., 'HackerOne, Inc.')
+  -o, --output <file>          File to save results. If not set, results are printed to stdout.
+  -s, --silent                 Suppress banner and non-essential output.
+  -h, --help                   Display this help message
+
+Examples:
+  ./crt_v2.1.sh --domain hackerone.com
+  ./crt_v2.1.sh --org 'HackerOne, Inc.' --output ./results.txt
+  ./crt_v2.1.sh -d example.com -s | grep '.com'
+  ./crt_v2.1.sh -d example.com -s | httpx
+```
+
+All the original credits go to [az7rb](https://github.com/az7rb)
+
 ### Updated Documentation for crt.sh v2.0
 
 The **v2.0** version of the script, now named `crt_v2.sh`, introduces significant improvements in performance, reliability, and documentation. Below are the updated instructions for setting up and using both the original script `crt.sh` and the new `crt_v2.sh`:
diff --git a/crt.sh b/crt.sh
old mode 100644
new mode 100755
index a5e3a68..f0f4650
--- a/crt.sh
+++ b/crt.sh
@@ -29,8 +29,8 @@ echo "
 			 echo ""
 			 cat output/domain.$req.txt
 			 echo ""
-			 echo -e "\e[32m[+]\e[0m Total Save will be \e[31m"$(cat output/domain.$req.txt | wc -l)"\e[0m Domain only"
-			 echo -e "\e[32m[+]\e[0m Output saved in output/domain.$req.txt"
+			 echo -e "\033[32m[+]\033[0m Total Save will be \033[31m"$(cat output/domain.$req.txt | wc -l)"\033[0m Domain only"
+			 echo -e "\033[32m[+]\033[0m Output saved in output/domain.$req.txt"
 }		 
     # Request the Search with Organization Name
 	Organization() {
@@ -42,8 +42,8 @@ echo "
 			 echo ""
 			 cat output/org.$req.txt
 			 echo ""
-			 echo -e "\e[32m[+]\e[0m Total Save will be \e[31m"$(cat output/org.$req.txt | wc -l)"\e[0m Domain only"
-			 echo -e "\e[32m[+]\e[0m Output saved in output/org.$req.txt"
+			 echo -e "\033[32m[+]\033[0m Total Save will be \033[31m"$(cat output/org.$req.txt | wc -l)"\033[0m Domain only"
+			 echo -e "\033[32m[+]\033[0m Output saved in output/org.$req.txt"
 }	
 
 if [ -z $1 ]
diff --git a/crt_v2.1.sh b/crt_v2.1.sh
new file mode 100755
index 0000000..1a58a97
--- /dev/null
+++ b/crt_v2.1.sh
@@ -0,0 +1,269 @@
+#!/usr/bin/env bash
+
+# ==============================================================================
+# @module crt_v2.sh
+# @description
+#   This script queries the crt.sh certificate transparency log to retrieve domain names associated with specific domains or organizations.
+#   It processes the raw certificate data, cleaning and filtering it to provide unique and relevant domain results.
+#
+#   Key features include:
+#     - Searching for domain names and subdomains.
+#     - Searching for domains associated with specific organizations.
+#     - Cleaning and de-duplicating search results.
+#     - Outputting results to standard output or a specified file.
+#
+# @author
+#   az7rb, Arqsz
+# ==============================================================================
+
+# Display banner
+banner="
++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+|      ..| search crt.sh v2.4 |..      |
++    site: crt.sh Certificate Search   +
+|           Twitter: az7rb             |
+|         Modified by: Arqsz           |
++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+"
+
+##!
+# @description
+#   Displays the help message for the script, detailing its usage,
+#   available options, and examples.
+#
+# @example
+#   show_help
+#'
+show_help() {
+    echo "A script to query the crt.sh certificate transparency log."
+    echo ""
+    echo "Usage: $0 [OPTIONS]"
+    echo ""
+    echo "Options:"
+    echo "  -d, --domain <domain>        Search for a specific domain name (e.g., hackerone.com)"
+    echo "      --org <organization>     Search for a specific organization name (e.g., 'HackerOne, Inc.')"
+    echo "  -o, --output <file>          File to save results. If not set, results are printed to stdout."
+    echo "  -s, --silent                 Suppress banner and non-essential output."
+    echo "  -h, --help                   Display this help message"
+    echo ""
+    echo "Examples:"
+    echo "  $0 --domain hackerone.com"
+    echo "  $0 --org 'HackerOne, Inc.' --output ./results.txt"
+    echo "  $0 -d example.com -s | grep '.com'"
+    echo "  $0 -d example.com -s | httpx"
+}
+
+##!
+# @description
+#   Cleans and filters input data, typically piped to this function,
+#   by removing unwanted characters and duplicates. It converts escaped
+#   newlines to actual newlines, removes wildcard characters (*), filters out
+#   email addresses and lines containing spaces, and ensures entries contain a dot.
+#   Finally, it sorts the results and removes duplicates.
+#
+# @returns {string}
+#   A multi-line string of cleaned, sorted, and unique domain names.
+#
+# @example
+#   echo "example.com\\n*.test.com\\nuser@example.com" | clean_results
+#'
+clean_results() {
+    sed 's/\\n/\n/g' |
+        sed 's/\*.//g' |
+        # Filter out entries that are likely email addresses
+        grep -v '@' |
+        # Filter out lines with spaces (e.g., certificate names)
+        grep -v ' ' |
+        # Filter out entries that do not contain a dot (i.e., not a full domain)
+        grep '\.' |
+        # Remove any leading/trailing whitespace
+        sed 's/^[ \t]*//;s/[ \t]*$//' |
+        sort -u
+}
+
+##!
+# @description
+#   Searches the crt.sh certificate transparency log for certificates
+#   associated with a given domain name. It fetches common names and
+#   name values from the crt.sh JSON API, then cleans and filters the results.
+#
+# @arg {string} $1 - The domain name to search for (e.g., "example.com").
+# @arg {boolean} $2 - A flag indicating whether silent mode is enabled.
+#   If `true`, suppresses status messages printed to standard error.
+#
+# @returns {string}
+#   A multi-line string of unique and cleaned domain names found for the specified domain.
+#   Returns an empty string if no results are found or the request fails.
+#
+# @example
+#   domain_search "hackerone.com" false
+#'
+domain_search() {
+    local domain_req="$1"
+    local silent_mode="$2"
+
+    if [[ "$silent_mode" = false ]]; then
+        # Print status messages to stderr to not interfere with stdout
+        echo "[*] Searching for domain: $domain_req" >&2
+    fi
+
+    local response
+    response=$(curl -fs "https://crt.sh?q=%.$domain_req&output=json")
+
+    # If request fails or returns no data, return nothing.
+    if [[ $? -ne 0 || -z "$response" || "$response" == "[]" ]]; then
+        return
+    fi
+
+    local results
+    results=$(echo "$response" | jq -r '.[].common_name, .[].name_value' | clean_results)
+
+    echo "$results"
+}
+
+##!
+# @description
+#   Searches the crt.sh certificate transparency log for certificates
+#   associated with a given organization name. It fetches common names and
+#   name values from the crt.sh JSON API, then cleans and filters the results.
+#
+# @arg {string} $1 - The organization name to search for (e.g., "HackerOne, Inc.").
+#   This argument should be URL-encoded if it contains special characters.
+# @arg {boolean} $2 - A flag indicating whether silent mode is enabled.
+#   If `true`, suppresses status messages printed to standard error.
+#
+# @returns {string}
+#   A multi-line string of unique and cleaned domain names found for the specified organization.
+#   Returns an empty string if no results are found or the request fails.
+#
+# @example
+#   org_search "HackerOne%2C%20Inc." false
+#'
+org_search() {
+    local org_req="$1"
+    local silent_mode="$2"
+
+    if [[ "$silent_mode" = false ]]; then
+        echo "[*] Searching for organization: $org_req" >&2
+    fi
+
+    local response
+    response=$(curl -fs "https://crt.sh?q=$org_req&output=json")
+
+    # If request fails or returns no data, return nothing.
+    if [[ $? -ne 0 || -z "$response" || "$response" == "[]" ]]; then
+        return
+    fi
+
+    local results
+    results=$(echo "$response" | jq -r '.[].common_name, .[].name_value' | clean_results)
+
+    echo "$results"
+}
+
+DOMAIN_SEARCH=""
+ORG_SEARCH=""
+OUTPUT_FILE=""
+SILENT_MODE=false
+
+if [[ "$#" -eq 0 ]]; then
+    show_help
+    exit 0
+fi
+
+while [[ "$#" -gt 0 ]]; do
+    case "$1" in
+    -h | --help)
+        show_help
+        exit 0
+        ;;
+    -s | --silent)
+        SILENT_MODE=true
+        ;;
+    -d | --domain)
+        if [[ -n "$2" && ! "$2" =~ ^- ]]; then
+            DOMAIN_SEARCH="$2"
+            shift
+        else
+            echo "Error: Missing argument for $1" >&2
+            exit 1
+        fi
+        ;;
+    --org)
+        if [[ -n "$2" && ! "$2" =~ ^- ]]; then
+            ORG_SEARCH="$2"
+            shift
+        else
+            echo "Error: Missing argument for $1" >&2
+            exit 1
+        fi
+        ;;
+    -o | --output)
+        if [[ -n "$2" && ! "$2" =~ ^- ]]; then
+            OUTPUT_FILE="$2"
+            shift
+        else
+            echo "Error: Missing argument for $1" >&2
+            exit 1
+        fi
+        ;;
+    *)
+        echo "Error: Unknown parameter passed: $1" >&2
+        show_help
+        exit 1
+        ;;
+    esac
+    shift
+done
+
+if [[ "$SILENT_MODE" = false ]]; then
+    echo "${banner}" >&2
+fi
+
+if [[ -z "$DOMAIN_SEARCH" && -z "$ORG_SEARCH" ]]; then
+    show_help
+    exit 0
+fi
+
+if [[ -n "$DOMAIN_SEARCH" && -n "$ORG_SEARCH" ]]; then
+    echo "Error: Please specify either a domain (-d) or an organization (--org), not both." >&2
+    exit 1
+elif [[ -z "$DOMAIN_SEARCH" && -z "$ORG_SEARCH" ]]; then
+    echo "Error: You must specify a domain (-d) or an organization (--org) to search." >&2
+    show_help
+    exit 1
+fi
+
+RESULTS=""
+if [[ -n "$DOMAIN_SEARCH" ]]; then
+    RESULTS=$(domain_search "$DOMAIN_SEARCH" "$SILENT_MODE")
+elif [[ -n "$ORG_SEARCH" ]]; then
+    # URL-encode the organization string for the query
+    ORG_SEARCH_ENCODED=$(echo -n "$ORG_SEARCH" | jq -sRr @uri)
+    RESULTS=$(org_search "$ORG_SEARCH_ENCODED" "$SILENT_MODE")
+fi
+
+if [[ -z "$RESULTS" ]]; then
+    if [[ "$SILENT_MODE" = false ]]; then
+        echo "[-] No results found." >&2
+    fi
+    exit 1
+fi
+
+# Decide where to send the output based on whether -o was used
+if [[ -n "$OUTPUT_FILE" ]]; then
+    output_dir=$(dirname "$OUTPUT_FILE")
+    mkdir -p "$output_dir"
+    if [[ ! -d "$output_dir" ]]; then
+        echo "Error: Could not create output directory for: $OUTPUT_FILE" >&2
+        exit 1
+    fi
+    echo "$RESULTS" >"$OUTPUT_FILE"
+
+    if [[ "$SILENT_MODE" = false ]]; then
+        printf "[+] Total of %s unique domains found.\n" "$(echo "$RESULTS" | wc -l)" >&2
+        printf "[+] Results saved to %s\n" "$OUTPUT_FILE" >&2
+    fi
+else
+    echo "$RESULTS"
+fi
diff --git a/crt_v2.sh b/crt_v2.sh
old mode 100644
new mode 100755
index 770018b..b5cbb59
--- a/crt_v2.sh
+++ b/crt_v2.sh
@@ -74,8 +74,8 @@ Domain() {
     echo ""
     echo "$results"
     echo ""
-    echo -e "\e[32m[+]\e[0m Total Save will be \e[31m$(echo "$results" | wc -l)\e[0m Domain only"
-    echo -e "\e[32m[+]\e[0m Output saved in $output_file"
+    echo -e "\033[32m[+]\033[0m Total Save will be \033[31m$(echo "$results" | wc -l)\033[0m Domain only"
+    echo -e "\033[32m[+]\033[0m Output saved in $output_file"
 }
 
 # Function: Organization
@@ -119,8 +119,8 @@ Organization() {
     echo ""
     echo "$results"
     echo ""
-    echo -e "\e[32m[+]\e[0m Total Save will be \e[31m$(echo "$results" | wc -l)\e[0m Domain only"
-    echo -e "\e[32m[+]\e[0m Output saved in $output_file"
+    echo -e "\033[32m[+]\033[0m Total Save will be \033[31m$(echo "$results" | wc -l)\033[0m Domain only"
+    echo -e "\033[32m[+]\033[0m Output saved in $output_file"
 }
 
 # Main Script Logic
diff --git a/docs/crt_v2.1.md b/docs/crt_v2.1.md
new file mode 100644
index 0000000..fb38c0b
--- /dev/null
+++ b/docs/crt_v2.1.md
@@ -0,0 +1,158 @@
+# crt.sh Documentation
+
+## Table of Contents
+- [**crt_v2.sh**](#crt_v2sh-crt_v2sh)
+    <ul>
+      <li><a href="#crt_v2sh-crt_v2sh-show_help">show_help()</a></li>
+      <li><a href="#crt_v2sh-crt_v2sh-clean_results">clean_results()</a></li>
+      <li><a href="#crt_v2sh-crt_v2sh-domain_search">domain_search()</a></li>
+      <li><a href="#crt_v2sh-crt_v2sh-org_search">org_search()</a></li>
+    </ul>
+
+
+<h2 id="crt_v2sh-crt_v2sh">Module: crt_v2.sh</h2>
+
+**Author:** az7rb, Arqsz
+
+### Description
+
+This script queries the crt.sh certificate transparency log to retrieve domain names associated with specific domains or organizations.
+
+It processes the raw certificate data, cleaning and filtering it to provide unique and relevant domain results.
+
+
+
+Key features include:
+
+- Searching for domain names and subdomains.
+
+- Searching for domains associated with specific organizations.
+
+- Cleaning and de-duplicating search results.
+
+- Outputting results to standard output or a specified file.
+
+
+
+## Functions
+
+
+<h4 id="crt_v2sh-crt_v2sh-show_help"><code>show_help</code></h4>
+
+
+Displays the help message for the script, detailing its usage,
+available options, and examples.
+
+
+
+
+
+#### Example:
+
+```bash
+show_help
+```
+
+
+
+
+<h4 id="crt_v2sh-crt_v2sh-clean_results"><code>clean_results</code></h4>
+
+
+Cleans and filters input data, typically piped to this function,
+by removing unwanted characters and duplicates. It converts escaped
+newlines to actual newlines, removes wildcard characters (*), filters out
+email addresses and lines containing spaces, and ensures entries contain a dot.
+Finally, it sorts the results and removes duplicates.
+
+
+
+
+
+#### Example:
+
+```bash
+echo "example.com\\n*.test.com\\nuser@example.com" | clean_results
+```
+
+
+
+#### Returns:
+
+<p>{string}
+A multi-line string of cleaned, sorted, and unique domain names.
+</p>
+
+
+
+<h4 id="crt_v2sh-crt_v2sh-domain_search"><code>domain_search</code></h4>
+
+
+Searches the crt.sh certificate transparency log for certificates
+associated with a given domain name. It fetches common names and
+name values from the crt.sh JSON API, then cleans and filters the results.
+
+
+
+#### Arguments
+
+| Name | Type | Description |
+|------|-------------|-------------|
+| `$1` | *string* | The domain name to search for (e.g., "example.com"). |
+| `$2` | *boolean* | A flag indicating whether silent mode is enabled. If `true`, suppresses status messages printed to standard error. |
+
+
+
+
+#### Example:
+
+```bash
+domain_search "hackerone.com" false
+```
+
+
+
+#### Returns:
+
+<p>{string}
+A multi-line string of unique and cleaned domain names found for the specified domain.
+Returns an empty string if no results are found or the request fails.
+</p>
+
+
+
+<h4 id="crt_v2sh-crt_v2sh-org_search"><code>org_search</code></h4>
+
+
+Searches the crt.sh certificate transparency log for certificates
+associated with a given organization name. It fetches common names and
+name values from the crt.sh JSON API, then cleans and filters the results.
+
+
+
+#### Arguments
+
+| Name | Type | Description |
+|------|-------------|-------------|
+| `$1` | *string* | The organization name to search for (e.g., "HackerOne, Inc."). This argument should be URL-encoded if it contains special characters. |
+| `$2` | *boolean* | A flag indicating whether silent mode is enabled. If `true`, suppresses status messages printed to standard error. |
+
+
+
+
+#### Example:
+
+```bash
+org_search "HackerOne%2C%20Inc." false
+```
+
+
+
+#### Returns:
+
+<p>{string}
+A multi-line string of unique and cleaned domain names found for the specified organization.
+Returns an empty string if no results are found or the request fails.
+</p>
+
+