51 changed files with 3724 additions and 1848 deletions
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@ -1,5 +0,0 @@
-# Scala Steward: Reformat with sbt-java-formatter 0.8.0
-57ce691a00babb03e0cae03a26fe56d63fc609af
-
-# Scala Steward: Reformat with scalafmt 3.6.1
-f2b19baca828a4d88b46bc009aef6d7115e63924
--- a/.github/scala-steward.conf
+++ b/.github/scala-steward.conf
@ -1,3 +0,0 @@
-# If true, Scala Steward will sign off all commits (e.g. `git --signoff`).
-# Default: false
-signoffCommits = true
--- a/.github/workflows/docker-latest.yml
+++ b/.github/workflows/docker-latest.yml
@ -3,8 +3,6 @@ name: Update docker image
 on:
  push:
    branches: [ master ]
-    tags:
-      - 'v*'

 jobs:
  build:
@ -22,20 +20,7 @@ jobs:
      - name: Assemble Jar
        run: sbt assembly

-      -
-        name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: librecaptcha/lc-core
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-
      - name: Login to Docker Hub
-        if: github.event_name != 'pull_request'
        uses: docker/login-action@v1
        with:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
@ -51,13 +36,8 @@ jobs:
        with:
          context: ./
          file: ./Runner.Dockerfile
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          platforms: |
-            linux/amd64
-            linux/arm64
-            linux/arm/v7
+          push: true
+          tags: librecaptcha/lc-core:latest

      - name: Image digest
        run: echo ${{ steps.docker_build.outputs.digest }}
--- a/.github/workflows/scala.yml
+++ b/.github/workflows/scala.yml
@ -1,7 +1,8 @@
-name: Core CI
+name: Scala CI

 on:
  push:
+    branches: [ master ]
  pull_request:
    branches: [ master ]

@ -16,10 +17,7 @@ jobs:
      uses: actions/setup-java@v1
      with:
        java-version: 1.11
-    - uses: sbt/setup-sbt@v1
    - name: Run tests
-      run: sbt test assembly
+      run: sbt test
    - name: Run linter
      run: sbt "scalafixAll --check"
-    - name: Run locust tests
-      run: sudo apt-get install -y tesseract-ocr && ./tests/run.sh
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,6 @@
 /*.log
 /*.png
+**/*.db
 /bin/
 /project/**
 /target/
@ -7,13 +8,8 @@
 .bloop
 .metals
 .vscode
-.bsp
-
-# for python test env
-/testEnv/

 # for various captcha
 /known/
 /unknown/
 /lib/fonts/
-
--- a/.scalafix.conf
+++ b/.scalafix.conf
@ -1,5 +1,8 @@
 rules=[
+    ExplicitResultTypes,
+    RemoveUnused,
    DisableSyntax,
    LeakingImplicitClassVal,
    NoValInForComprehension,
+    ProcedureSyntax
 ]
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@ -1,3 +1,2 @@
-version="3.8.3" 
-maxColumn = 120
-runner.dialect = scala3
+version=2.5.2 
+maxColumn = 120
--- a/17
+++ b/17
@ -1,13 +1,12 @@
-FROM eclipse-temurin:17-jre-jammy AS base-builder
-ARG SBT_VERSION=1.7.1
+FROM adoptopenjdk/openjdk16:alpine AS base-builder
+ARG SBT_VERSION=1.3.13
+RUN apk add --no-cache bash
 ENV JAVA_HOME="/usr/lib/jvm/default-jvm/"
 ENV PATH=$PATH:${JAVA_HOME}/bin
 RUN \
-        apt update && \
-        apt install -y wget && \
 	wget -O sbt-$SBT_VERSION.tgz https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz && \
-        tar -xzvf sbt-$SBT_VERSION.tgz && \
-        rm sbt-$SBT_VERSION.tgz
+  	tar -xzvf sbt-$SBT_VERSION.tgz && \
+  	rm sbt-$SBT_VERSION.tgz

 ENV PATH=$PATH:/sbt/bin/

@ -23,15 +22,15 @@ FROM sbt-builder as builder
 COPY src/ src/
 RUN sbt assembly

-FROM eclipse-temurin:17-jre-jammy  AS base-core
+FROM adoptopenjdk/openjdk16:alpine-jre  AS base-core
 ENV JAVA_HOME="/usr/lib/jvm/default-jvm/"
-RUN apt update && apt install -y fonts-dejavu
+RUN apk add --update ttf-dejavu
 ENV PATH=$PATH:${JAVA_HOME}/bin


 FROM base-core
 WORKDIR /lc-core
-COPY --from=builder /build/target/scala-3.6.2/LibreCaptcha.jar .
+COPY --from=builder /build/target/scala-2.13/LibreCaptcha.jar .
 RUN mkdir data/

 EXPOSE 8888
--- a/README.md
+++ b/README.md
@ -1,40 +1,16 @@
 # LibreCaptcha
 LibreCaptcha is a framework that allows developers to create their own [CAPTCHA](https://en.wikipedia.org/wiki/CAPTCHA)s.
-The framework defines the API for a CAPTCHA generator and takes care of mundane details
-such as:
-* An HTTP interface for serving CAPTCHAs
-* Background workers to pre-compute CAPTCHAs and to store them in a database
-* Managing secrets for the CAPTCHAs (tokens, expected answers, etc)
-* Safe re-impressions of CAPTCHA images (by creating unique tokens for every impression)
-* Garbage collection of stale CAPTCHAs
-* Sandboxed plugin architecture (TBD)
-
-Some sample CAPTCHA generators are included in the distribution (see below). We will continue adding more samples to the list. For quick
-deployments the samples themselves might be sufficient. Projects with more resources might want create their own CAPTCHAs
-and use the samples as inspiration. See the [CAPTCHA creation guide](https://github.com/librecaptcha/lc-core/wiki/Creating-your-own-CAPTCHA-provider).
-
-## Current Status
-The framework is stable, but since it is our first public release, we recommend using it only on small to medium scale
-web apps.
-
-The sample CAPTCHAs are also just that, samples. They have not been tested against bots or CAPTCHA crackers yet.
-
-## Quick start with Java
-
-1. Download the `jar` file from the latest release
-2. Type `mkdir data/`.
-   (The data directory is used to store a config file that you can tweak, and for storing the Database)
-3. Type `java -jar LibreCaptcha.jar`
-4. Open [localhost:8888/demo/index.html](http://localhost:8888/demo/index.html) in browser
-
-We recommend a Java 11+ runtime as that's what we compile the code with.
-
-Alternatively,
-1. Install [sbt](https://www.scala-sbt.org/)
-2. Clone this repository
-3. Type `sbt run` within the repository
-4. Open [localhost:8888/demo/index.html](http://localhost:8888/demo/index.html) in browser
+It allows developers to easily create new types of CAPTCHAs by defining a structure for them. Mundane details are handled by the
+framework itself. Details such as:
+  * Background workers to render CAPTCHAs and to store them in a database
+  * Providing an HTTP interface for serving CAPTCHAs
+  * Managing secrets for the CAPTCHAs (tokens, expected answers, etc)
+  * Safe re-impressions of CAPTCHA images (by creating unique tokens for every impression)
+  * Sandboxed plugin architecture (To be done)

+Some sample CAPTCHA generators are included in the distribution. We will continue adding more samples to the list. For quick
+deployments the samples themselves might be sufficient. Projects with more resources could create their own CAPTCHAs
+and use the samples as inspiration.

 ## Quick start with Docker
 Using `docker-compose`:
@ -47,35 +23,17 @@ docker-compose up
 Using `docker`:

 ```
-docker run -p=8888:8888 -v ./lcdata:/lc-core/data librecaptcha/lc-core:2.0
+docker run -v lcdata:/lc-core/data librecaptcha/lc-core:latest
 ```

 A default `config.json` is automatically created in the mounted volume.

-The above commands should work with `podman` as well, if docker.io registry is pre-configured. Otherwise,
-you can manually specify the repository like so:
+To test the installation, try:

 ```
-podman run -p=8888:8888 -v ./lcdata:/lc-core/data docker.io/librecaptcha/lc-core:2.0
+curl -d '{"media":"image/png","level":"easy","input_type":"text"}' localhost:8888/v1/captcha
 ```

-## Quick test
-Open [localhost:8888/demo/index.html](http://localhost:8888/demo/index.html) in browser.
-
-Alternatively, on the command line, try:
-
-```
-> $ curl -d '{"media":"image/png","level":"easy","input_type":"text","size":"350x100"}' localhost:8888/v2/captcha
-{"id":"3bf928ce-a1e7-4616-b34f-8252d777855d"}
-
-> $ curl "localhost:8888/v1/media?id=3bf928ce-a1e7-4616-b34f-8252d777855d" -o sample.png
-
-> $ file sample.png
-sample.png: PNG image data, 350 x 100, 8-bit/color RGB, non-interlaced
-```
-
-The API endpoints are described at the end of this file.
-
 ## Configuration
 If a `config.json` file is not present in the `data/` folder, the app creates one, and this can be modified
 to customize the app features, such as which CAPTCHAs are enabled and their difficulty settings.
@ -98,115 +56,68 @@ create CAPTCHAs that suit their application and audience, with matching themes a
 And, the more the variety of CAPTCHAS, the harder it is for bots to crack CAPTCHAs.

 ## Sample CAPTCHAs
-These are included in this server.
-
-### ShadowText
-![ShadowText Sample](./samples/shadowText.png)
-

 ### FilterCaptcha

 ![FilterCaptcha Sample](./samples/FilterChallenge.png)

-An image of a random string of alphabets is created. Then a series of image filters that add effects such as Smear, Diffuse, and Ripple are applied to the image to make it less readable.
+An image of a random string of alphabets is created. Then a series of image filters that add effecs such as Smear, Diffuse, and Ripple are applied to the image to make it less readable.

 ### RainDropsCaptcha
 ![RaindDrops Sample](./samples/RainDropsCaptcha.gif)

-### PoppingCharactersCaptcha
-![PoppingCharacters Sample](./samples/popping.gif)
+### BlurCaptcha
+An image of a word is blurred before being shown to the user.

 ### LabelCaptcha
-This CAPTCHA provider takes in two sets of images. One with known labels, and the other unknown.
-The created image has a pair of words one from each set.
-The user is tested on the known word, and their answer to the unknown word is recorded.
-If a sufficient number of users agree on their answer to the unknown word, it is transferred to the list of known words.
-
-(There is a known issue with this provider; see issue #68 )
+An image that has a pair of words is created. The answer to one of the words is known and to that of the other is unknown. The user is tested on the known word, and their answer to the unknown word is recorded. If a sufficient number of users agree on their answer to the unknown word, it is transferred to the list of known words.

 ***

-## HTTP API
-
-The service can be accessed using a simple HTTP API.
-
+## HTTP API 
 ### - `/v1/captcha`: `POST`
- Parameters:
-    - `level`: `String` -
+  - Parameters:
+    - `level`: `String` - 
      The difficulty level of a captcha
-        - easy
-        - medium
-        - hard
-    - `input_type`: `String` -
+       - easy
+       - medium
+       - hard
+    - `input_type`: `String` - 
      The type of input option for a captcha
-        - text
-        - (More to come)
-    - `media`: `String` -
+       - text
+       - (More to come)
+    - `media`: `String` - 
      The type of media of a captcha
-        - image/png
-        - image/gif
-        - (More to come)
-    - `size`: String -
-      The dimensions of a captcha. It needs to be a string in the format `"widthxheight"` in pixels, and will be matched
-      with the `allowedSizes` config setting. Example: `size: "450x200"` which requests an image of width 450 and height
-      200 pixels.
+       - image/png
+       - image/gif
+       - (More to come)
+    - `size`: `Map` - 
+      The dimensions of a captcha (Optional). It needs two more fields nested in this parameter
+       - `height`: `Int`
+       - `width`: `Int`

- Returns:
+  - Return type:
    - `id`: `String` - The uuid of the captcha generated


-### - `/v1/media`: `GET`
- Parameters:
+### - `/v1/media`: `GET` 
+  - Parameters:
    - `id`: `String` - The uuid of the captcha

- Returns:
+  - Return type:
    - `image`: `Array[Byte]` - The requested media as bytes


 ### - `/v1/answer`: `POST`
- Parameter:
+  - Parameter:
    - `id`: `String` - The uuid of the captcha that needs to be solved
    - `answer`: `String` - The answer to the captcha that needs to be validated

- Returns:
+  - Return Type:
    - `result`: `String` - The result after validation/checking of the answer
-        - True - If the answer is correct
-        - False - If the answer is incorrect
-        - Expired - If the time limit to solve the captcha exceeds
-
-
-## Example usage
-
-In javascript:
-
-```js
-const resp = await fetch("/v2/captcha", {
-    method: 'POST',
-    body: JSON.stringify({level: "easy", media: "image/png", "input_type" : "text", size: "350x100"})
-})
-
-const respJson = await resp.json();
-
-let captchaId = null;
-
-if (resp.ok) {
-    // The CAPTCHA can be displayed using the data in respJson.
-    console.log(respJson);
-    // Store the id somewhere so that it can be used later for answer verification
-    captchaId = respJson.id;
-} else {
-    console.err(respJson);
-}
-
-
-// When user submits an answer it can be sent to the server for verification thusly:
-const resp = await fetch("/v2/answer", {
-    method: 'POST',
-    body: JSON.stringify({id: captchaId, answer: "user input"})
-});
-const respJson = await resp.json();
-console.log(respJson.result);
-```
+      - True - If the answer is correct
+      - False - If the answer is incorrect
+      - Expired - If the time limit to solve the captcha exceeds

 ***

--- a/Runner.Dockerfile
+++ b/Runner.Dockerfile
@ -1,12 +1,12 @@
-FROM eclipse-temurin:17-jre-jammy  AS base-core
+FROM adoptopenjdk/openjdk16:alpine-jre  AS base-core
 ENV JAVA_HOME="/usr/lib/jvm/default-jvm/"
-RUN apt update && apt install -y fonts-dejavu
+RUN apk add --update ttf-dejavu
 ENV PATH=$PATH:${JAVA_HOME}/bin


 FROM base-core
 RUN mkdir /lc-core
-COPY target/scala-3.6.2/LibreCaptcha.jar /lc-core
+COPY target/scala-2.13/LibreCaptcha.jar /lc-core
 WORKDIR /lc-core
 RUN mkdir data/

--- a/build.sbt
+++ b/build.sbt
@ -2,38 +2,29 @@ lazy val root = (project in file(".")).settings(
  inThisBuild(
    List(
      organization := "com.example",
-      scalaVersion := "3.6.2",
-      version := "0.2.1-snapshot",
+      scalaVersion := "2.13.5",
+      version := "0.1.0-SNAPSHOT",
      semanticdbEnabled := true,
-      semanticdbVersion := scalafixSemanticdb.revision
-
-      // This is apparently not supported on Scala 3 currently
-      // scalafixScalaBinaryVersion := "3.1"
+      semanticdbVersion := scalafixSemanticdb.revision,
+      scalafixScalaBinaryVersion := "2.13"
    )
  ),
  name := "LibreCaptcha",
-  libraryDependencies += "com.sksamuel.scrimage" % "scrimage-core" % "4.3.0",
-  libraryDependencies += "com.sksamuel.scrimage" % "scrimage-filters" % "4.3.0",
-  libraryDependencies += "org.json4s" %% "json4s-jackson" % "4.0.7"
+  libraryDependencies += "com.sksamuel.scrimage" % "scrimage-core" % "4.0.12",
+  libraryDependencies += "com.sksamuel.scrimage" % "scrimage-filters" % "4.0.12",
+  libraryDependencies += "org.json4s" % "json4s-jackson_2.13" % "3.6.11"
 )

-Compile / unmanagedResourceDirectories += { baseDirectory.value / "lib" }
+unmanagedResourceDirectories in Compile += { baseDirectory.value / "lib" }
 scalacOptions ++= List(
+  "-Yrangepos",
+  "-Ywarn-unused",
  "-deprecation"
 )
 javacOptions += "-g:none"
 compileOrder := CompileOrder.JavaThenScala
-javafmtOnCompile := false
-assembly / mainClass := Some("lc.LCFramework")
-Compile / run / mainClass := Some("lc.LCFramework")
-assembly / assemblyJarName := "LibreCaptcha.jar"
+mainClass in assembly := Some("lc.LCFramework")
+mainClass in (Compile, run) := Some("lc.LCFramework")
+assemblyJarName in assembly := "LibreCaptcha.jar"

-ThisBuild / assemblyMergeStrategy := {
-  case PathList("module-info.class")         => MergeStrategy.discard
-  case x if x.endsWith("/module-info.class") => MergeStrategy.discard
-  case x =>
-    val oldStrategy = (ThisBuild / assemblyMergeStrategy).value
-    oldStrategy(x)
-}
-
-run / fork := true
+fork in run := true
--- a/data/.gitignore
+++ b/data/.gitignore
@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
--- a/data/config.json
+++ b/data/config.json
@ -0,0 +1,32 @@
+{
+  "randomSeed" : 20,
+  "port" : 8888,
+  "captchaExpiryTimeLimit" : 5,
+  "throttle" : 10,
+  "threadDelay" : 2,
+  "captchas" : [ {
+    "name" : "FilterChallenge",
+    "allowedLevels" : [ "medium", "hard" ],
+    "allowedMedia" : [ "image/png" ],
+    "allowedInputType" : [ "text" ],
+    "config" : { }
+  }, {
+    "name" : "GifCaptcha",
+    "allowedLevels" : [ "hard" ],
+    "allowedMedia" : [ "image/gif" ],
+    "allowedInputType" : [ "text" ],
+    "config" : { }
+  }, {
+    "name" : "ShadowTextCaptcha",
+    "allowedLevels" : [ "easy" ],
+    "allowedMedia" : [ "image/png" ],
+    "allowedInputType" : [ "text" ],
+    "config" : { }
+  }, {
+    "name" : "RainDropsCaptcha",
+    "allowedLevels" : [ "easy", "medium" ],
+    "allowedMedia" : [ "image/gif" ],
+    "allowedInputType" : [ "text" ],
+    "config" : { }
+  } ]
+}
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,11 +1,9 @@
-version: "3.6"
+version: "3.8"

 services:
  lc-core:
    container_name: "libre-captcha"
    image: librecaptcha/lc-core:latest
-    # Comment "image" & uncomment "build" if you intend to build from source
-    #build: .
    volumes: 
      - "./docker-data:/lc-core/data"
    ports: 
--- a/lib/h2-1.4.200.jar
+++ b/lib/h2-1.4.200.jar
--- a/lib/h2-2.1.214.jar
+++ b/lib/h2-2.1.214.jar
--- a/project/build.properties
+++ b/project/build.properties
@ -1 +1 @@
-sbt.version=1.10.6
+sbt.version=1.4.9
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@ -1,4 +1,4 @@
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
-addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.27")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
+addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.6.0")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
--- a/samples/popping.gif
+++ b/samples/popping.gif
--- a/samples/shadowText.png
+++ b/samples/shadowText.png
--- a/scripts/simpleTest.py
+++ b/scripts/simpleTest.py
@ -1,38 +1,27 @@
 import http.client
 import json
-import subprocess
-import os

-tempDir = os.getenv('XDG_RUNTIME_DIR', '.')
 conn = http.client.HTTPConnection('localhost', 8888)
+conn.request("GET", "/v1/token?email=test")
+response = conn.getresponse()
+responseStr = response.read()
+user = json.loads(responseStr)
+token = user["token"]

 params = """{
-"level": "debug",
+"level": "medium",
 "media": "image/png",
 "input_type": "text"
 }"""

 def getCaptcha():
-    conn.request("POST", "/v1/captcha", body=params)
+    conn.request("POST", "/v1/captcha", body=params, headers={'access-token': user["token"]})
    response = conn.getresponse()

    if response:
        responseStr = response.read()
        return json.loads(responseStr)

-def getAndSolve(idStr):
-    conn.request("GET", "/v1/media?id=" + idStr)
-    response = conn.getresponse()
-
-    if response:
-        responseBytes = response.read()
-        fileName = tempDir + "/captcha.png"
-        with open(fileName, "wb") as f:
-            f.write(responseBytes)
-        ocrResult = subprocess.Popen("gocr " + fileName, shell=True, stdout=subprocess.PIPE)
-        ocrAnswer = ocrResult.stdout.readlines()[0].strip().decode()
-        return ocrAnswer
-
 def postAnswer(captchaId, ans):
    reply = {"answer": ans, "id" : captchaId}
    conn.request("POST", "/v1/answer", json.dumps(reply))
@ -44,6 +33,6 @@ def postAnswer(captchaId, ans):

 for i in range(0, 10000):
    captcha = getCaptcha()
+    #print(captcha)
    captchaId = captcha["id"]
-    ans = getAndSolve(captchaId)
-    print(i, postAnswer(captchaId, ans))
+    print(i, postAnswer(captchaId, "xyz"))
--- a/src/main/java/lc/captchas/FontFunCaptcha.java
+++ b/src/main/java/lc/captchas/FontFunCaptcha.java
@ -1,16 +1,16 @@
 package lc.captchas;

+import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FilenameFilter;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import lc.captchas.interfaces.Challenge;
 import lc.captchas.interfaces.ChallengeProvider;
 import lc.misc.HelperFunctions;
-import lc.misc.PngImageWriter;

 public class FontFunCaptcha implements ChallengeProvider {

@ -18,11 +18,13 @@ public class FontFunCaptcha implements ChallengeProvider {
    return "FontFunCaptcha";
  }

-  public Map<String, List<String>> supportedParameters() {
-    return Map.of(
-        "supportedLevels", List.of("medium"),
-        "supportedMedia", List.of("image/png"),
-        "supportedInputType", List.of("text"));
+  public HashMap<String, List<String>> supportedParameters() {
+    HashMap<String, List<String>> supportedParams = new HashMap<String, List<String>>();
+    supportedParams.put("supportedLevels", List.of("medium"));
+    supportedParams.put("supportedMedia", List.of("image/png"));
+    supportedParams.put("supportedInputType", List.of("text"));
+
+    return supportedParams;
  }

  public void configure(String config) {
@ -58,10 +60,9 @@ public class FontFunCaptcha implements ChallengeProvider {
    return null;
  }

-  private byte[] fontFun(
-      final int width, final int height, String captchaText, String level, String path) {
+  private byte[] fontFun(String captchaText, String level, String path) {
    String[] colors = {"#f68787", "#f8a978", "#f1eb9a", "#a4f6a5"};
-    BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+    BufferedImage img = new BufferedImage(350, 100, BufferedImage.TYPE_INT_RGB);
    Graphics2D graphics2D = img.createGraphics();
    for (int i = 0; i < captchaText.length(); i++) {
      Font font = loadCustomFont(level, path);
@ -75,21 +76,17 @@ public class FontFunCaptcha implements ChallengeProvider {
    graphics2D.dispose();
    ByteArrayOutputStream baos = new ByteArrayOutputStream();
    try {
-      PngImageWriter.write(baos, img);
+      ImageIO.write(img, "png", baos);
    } catch (Exception e) {
      e.printStackTrace();
    }
    return baos.toByteArray();
  }

-  public Challenge returnChallenge(String level, String size) {
+  public Challenge returnChallenge() {
    String secret = HelperFunctions.randomString(7);
-    final int[] size2D = HelperFunctions.parseSize2D(size);
-    final int width = size2D[0];
-    final int height = size2D[1];
    String path = "./lib/fonts/";
-    return new Challenge(
-        fontFun(width, height, secret, "medium", path), "image/png", secret.toLowerCase());
+    return new Challenge(fontFun(secret, "medium", path), "image/png", secret.toLowerCase());
  }

  public boolean checkAnswer(String secret, String answer) {
--- a/src/main/java/lc/captchas/GifCaptcha.java
+++ b/src/main/java/lc/captchas/GifCaptcha.java
@ -0,0 +1,79 @@
+package lc.captchas;
+
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.Color;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.imageio.stream.ImageOutputStream;
+import javax.imageio.stream.MemoryCacheImageOutputStream;
+import java.io.ByteArrayOutputStream;
+import lc.captchas.interfaces.Challenge;
+import lc.captchas.interfaces.ChallengeProvider;
+import lc.misc.HelperFunctions;
+import lc.misc.GifSequenceWriter;
+
+public class GifCaptcha implements ChallengeProvider {
+
+  private BufferedImage charToImg(String text) {
+    BufferedImage img = new BufferedImage(250, 100, BufferedImage.TYPE_INT_RGB);
+    Font font = new Font("Bradley Hand", Font.ROMAN_BASELINE, 48);
+    Graphics2D graphics2D = img.createGraphics();
+    graphics2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+    graphics2D.setRenderingHint(
+        RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+    graphics2D.setFont(font);
+    graphics2D.setColor(new Color((int) (Math.random() * 0x1000000)));
+    graphics2D.drawString(text, 45, 45);
+    graphics2D.dispose();
+    return img;
+  }
+
+  private byte[] gifCaptcha(String text) {
+    try {
+      ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+      ImageOutputStream output = new MemoryCacheImageOutputStream(byteArrayOutputStream);
+      GifSequenceWriter writer = new GifSequenceWriter(output, 1, 1000, true);
+      for (int i = 0; i < text.length(); i++) {
+        BufferedImage nextImage = charToImg(String.valueOf(text.charAt(i)));
+        writer.writeToSequence(nextImage);
+      }
+      writer.close();
+      output.close();
+      return byteArrayOutputStream.toByteArray();
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+    return null;
+  }
+
+  public void configure(String config) {
+    // TODO: Add custom config
+  }
+
+  public HashMap<String, List<String>> supportedParameters() {
+    HashMap<String, List<String>> supportedParams = new HashMap<String, List<String>>();
+    supportedParams.put("supportedLevels", List.of("hard"));
+    supportedParams.put("supportedMedia", List.of("image/gif"));
+    supportedParams.put("supportedInputType", List.of("text"));
+
+    return supportedParams;
+  }
+
+  public Challenge returnChallenge() {
+    String secret = HelperFunctions.randomString(6);
+    return new Challenge(gifCaptcha(secret), "image/gif", secret.toLowerCase());
+  }
+
+  public boolean checkAnswer(String secret, String answer) {
+    return answer.toLowerCase().equals(secret);
+  }
+
+  public String getId() {
+    return "GifCaptcha";
+  }
+}
--- a/src/main/java/lc/captchas/PoppingCharactersCaptcha.java
+++ b/src/main/java/lc/captchas/PoppingCharactersCaptcha.java
@ -1,137 +0,0 @@
-package lc.captchas;
-
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
-import java.util.stream.IntStream;
-import javax.imageio.stream.MemoryCacheImageOutputStream;
-import lc.captchas.interfaces.Challenge;
-import lc.captchas.interfaces.ChallengeProvider;
-import lc.misc.GifSequenceWriter;
-import lc.misc.HelperFunctions;
-
-public class PoppingCharactersCaptcha implements ChallengeProvider {
-
-  private int[] computeOffsets(
-      final Font font, final int width, final int height, final String text) {
-    final var img = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-    final var graphics2D = img.createGraphics();
-    final var frc = graphics2D.getFontRenderContext();
-    final var advances = new int[text.length() + 1];
-    final var spacing = font.getStringBounds(" ", frc).getWidth() / 3;
-    var currX = 0;
-    for (int i = 0; i < text.length(); i++) {
-      final var c = text.charAt(i);
-      advances[i] = currX;
-      currX += font.getStringBounds(String.valueOf(c), frc).getWidth();
-      currX += spacing;
-    }
-    ;
-    advances[text.length()] = currX;
-    graphics2D.dispose();
-    return advances;
-  }
-
-  private BufferedImage makeImage(
-      final Font font, final int width, final int height, final Consumer<Graphics2D> f) {
-    final var img = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-    final var graphics2D = img.createGraphics();
-    graphics2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-    graphics2D.setRenderingHint(
-        RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
-    graphics2D.setFont(font);
-    f.accept(graphics2D);
-    graphics2D.dispose();
-    return img;
-  }
-
-  private int jitter() {
-    return HelperFunctions.randomNumber(-2, +2);
-  }
-
-  private byte[] gifCaptcha(final int width, final int height, final String text) {
-    try {
-      final var fontHeight = (int) (height * 0.5);
-      final Font font = new Font("Arial", Font.ROMAN_BASELINE, fontHeight);
-      final var byteArrayOutputStream = new ByteArrayOutputStream();
-      final var output = new MemoryCacheImageOutputStream(byteArrayOutputStream);
-      final var writer = new GifSequenceWriter(output, 1, 900, true);
-      final var advances = computeOffsets(font, width, height, text);
-      final var expectedWidth = advances[advances.length - 1];
-      final var scale = width / (float) expectedWidth;
-      final var prevColor = Color.getHSBColor(0f, 0f, 0.1f);
-      IntStream.range(0, text.length())
-          .forEach(
-              i -> {
-                final var color =
-                    Color.getHSBColor(HelperFunctions.randomNumber(0, 100) / 100.0f, 0.6f, 1.0f);
-                final var nextImage =
-                    makeImage(
-                        font,
-                        width,
-                        height,
-                        (g) -> {
-                          g.scale(scale, 1);
-                          if (i > 0) {
-                            final var prevI = (i - 1) % text.length();
-                            g.setColor(prevColor);
-                            g.drawString(
-                                String.valueOf(text.charAt(prevI)),
-                                advances[prevI] + jitter(),
-                                fontHeight * 1.1f + jitter());
-                          }
-                          g.setColor(color);
-                          g.drawString(
-                              String.valueOf(text.charAt(i)),
-                              advances[i] + jitter(),
-                              fontHeight * 1.1f + jitter());
-                        });
-                try {
-                  writer.writeToSequence(nextImage);
-                } catch (final IOException e) {
-                  e.printStackTrace();
-                }
-              });
-      writer.close();
-      output.close();
-      return byteArrayOutputStream.toByteArray();
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
-    return null;
-  }
-
-  public void configure(final String config) {
-    // TODO: Add custom config
-  }
-
-  public Map<String, List<String>> supportedParameters() {
-    return Map.of(
-        "supportedLevels", List.of("hard"),
-        "supportedMedia", List.of("image/gif"),
-        "supportedInputType", List.of("text"));
-  }
-
-  public Challenge returnChallenge(String level, String size) {
-    final var secret = HelperFunctions.randomString(6);
-    final int[] size2D = HelperFunctions.parseSize2D(size);
-    final int width = size2D[0];
-    final int height = size2D[1];
-    return new Challenge(gifCaptcha(width, height, secret), "image/gif", secret.toLowerCase());
-  }
-
-  public boolean checkAnswer(String secret, String answer) {
-    return answer.toLowerCase().equals(secret);
-  }
-
-  public String getId() {
-    return "PoppingCharactersCaptcha";
-  }
-}
--- a/src/main/java/lc/captchas/ShadowTextCaptcha.java
+++ b/src/main/java/lc/captchas/ShadowTextCaptcha.java
@ -1,18 +1,21 @@
 package lc.captchas;

+import javax.imageio.ImageIO;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
 import java.awt.Color;
 import java.awt.Font;
-import java.awt.Graphics2D;
+import java.awt.font.TextLayout;
 import java.awt.image.BufferedImage;
 import java.awt.image.ConvolveOp;
 import java.awt.image.Kernel;
 import java.io.ByteArrayOutputStream;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+
+import lc.misc.HelperFunctions;
 import lc.captchas.interfaces.Challenge;
 import lc.captchas.interfaces.ChallengeProvider;
-import lc.misc.HelperFunctions;
-import lc.misc.PngImageWriter;

 public class ShadowTextCaptcha implements ChallengeProvider {

@ -24,69 +27,57 @@ public class ShadowTextCaptcha implements ChallengeProvider {
    // TODO: Add custom config
  }

-  public Map<String, List<String>> supportedParameters() {
-    return Map.of(
-        "supportedLevels", List.of("easy"),
-        "supportedMedia", List.of("image/png"),
-        "supportedInputType", List.of("text"));
+  public HashMap<String, List<String>> supportedParameters() {
+    HashMap<String, List<String>> supportedParams = new HashMap<String, List<String>>();
+    supportedParams.put("supportedLevels", List.of("easy"));
+    supportedParams.put("supportedMedia", List.of("image/png"));
+    supportedParams.put("supportedInputType", List.of("text"));
+
+    return supportedParams;
  }

  public boolean checkAnswer(String secret, String answer) {
    return answer.toLowerCase().equals(secret);
  }

-  private float[] makeKernel(int size) {
-    final int N = size * size;
-    final float weight = 1.0f / (N);
-    final float[] kernel = new float[N];
-    java.util.Arrays.fill(kernel, weight);
-    return kernel;
-  };
-
-  private byte[] shadowText(final int width, final int height, String text) {
-    BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-    final int fontHeight = (int) (height * 0.5f);
-    Font font = new Font("Arial", Font.PLAIN, fontHeight);
+  private byte[] shadowText(String text) {
+    BufferedImage img = new BufferedImage(350, 100, BufferedImage.TYPE_INT_RGB);
+    Font font = new Font("Arial", Font.ROMAN_BASELINE, 48);
    Graphics2D graphics2D = img.createGraphics();
+    graphics2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+    graphics2D.setRenderingHint(
+        RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+
+    TextLayout textLayout = new TextLayout(text, font, graphics2D.getFontRenderContext());
    HelperFunctions.setRenderingHints(graphics2D);
    graphics2D.setPaint(Color.WHITE);
-    graphics2D.fillRect(0, 0, width, height);
+    graphics2D.fillRect(0, 0, 350, 100);
    graphics2D.setPaint(Color.BLACK);
-    graphics2D.setFont(font);
-    final var stringWidth = graphics2D.getFontMetrics().stringWidth(text);
-    final var padding = (stringWidth > width) ? 0 : (width - stringWidth) / 2;
-    final var scaleX = (stringWidth > width) ? width / ((double) stringWidth) : 1d;
-    graphics2D.scale(scaleX, 1d);
-    graphics2D.drawString(text, padding, fontHeight * 1.1f);
+    textLayout.draw(graphics2D, 15, 50);
    graphics2D.dispose();
-    final int kernelSize = (int) Math.ceil((Math.min(width, height) / 50.0));
-    ConvolveOp op =
-        new ConvolveOp(
-            new Kernel(kernelSize, kernelSize, makeKernel(kernelSize)),
-            ConvolveOp.EDGE_NO_OP,
-            null);
+    float[] kernel = {
+      1f / 9f, 1f / 9f, 1f / 9f,
+      1f / 9f, 1f / 9f, 1f / 9f,
+      1f / 9f, 1f / 9f, 1f / 9f
+    };
+    ConvolveOp op = new ConvolveOp(new Kernel(3, 3, kernel), ConvolveOp.EDGE_NO_OP, null);
    BufferedImage img2 = op.filter(img, null);
    Graphics2D g2d = img2.createGraphics();
    HelperFunctions.setRenderingHints(g2d);
    g2d.setPaint(Color.WHITE);
-    g2d.scale(scaleX, 1d);
-    g2d.setFont(font);
-    g2d.drawString(text, padding - kernelSize, fontHeight * 1.1f);
+    textLayout.draw(g2d, 13, 50);
    g2d.dispose();
    ByteArrayOutputStream baos = new ByteArrayOutputStream();
    try {
-      PngImageWriter.write(baos, img2);
+      ImageIO.write(img2, "png", baos);
    } catch (Exception e) {
      e.printStackTrace();
    }
    return baos.toByteArray();
  }

-  public Challenge returnChallenge(String level, String size) {
+  public Challenge returnChallenge() {
    String secret = HelperFunctions.randomString(6);
-    final int[] size2D = HelperFunctions.parseSize2D(size);
-    final int width = size2D[0];
-    final int height = size2D[1];
-    return new Challenge(shadowText(width, height, secret), "image/png", secret.toLowerCase());
+    return new Challenge(shadowText(secret), "image/png", secret.toLowerCase());
  }
 }
--- a/src/main/java/lc/captchas/interfaces/ChallengeProvider.java
+++ b/src/main/java/lc/captchas/interfaces/ChallengeProvider.java
@ -1,12 +1,12 @@
 package lc.captchas.interfaces;

-import java.util.List;
 import java.util.Map;
+import java.util.List;

 public interface ChallengeProvider {
  public String getId();

-  public Challenge returnChallenge(String level, String size);
+  public Challenge returnChallenge();

  public boolean checkAnswer(String secret, String answer);

--- a/src/main/java/lc/misc/GifSequenceWriter.java
+++ b/src/main/java/lc/misc/GifSequenceWriter.java
@ -3,12 +3,12 @@

 package lc.misc;

-import java.awt.image.*;
-import java.io.*;
-import java.util.Iterator;
 import javax.imageio.*;
 import javax.imageio.metadata.*;
 import javax.imageio.stream.*;
+import java.awt.image.*;
+import java.io.*;
+import java.util.Iterator;

 public class GifSequenceWriter {
  protected ImageWriter gifWriter;
--- a/src/main/java/lc/misc/HelperFunctions.java
+++ b/src/main/java/lc/misc/HelperFunctions.java
@ -1,56 +1,27 @@
 package lc.misc;

 import java.awt.*;
-import java.util.Random;

 public class HelperFunctions {

-  private static Random random = new Random();
-
-  public static synchronized void setSeed(long seed) {
-    random.setSeed(seed);
-  }
-
-  public static int[] parseSize2D(final String size) {
-    final String[] fields = size.split("x");
-    final int[] result = {Integer.parseInt(fields[0]), Integer.parseInt(fields[1])};
-    return result;
-  }
-
  public static void setRenderingHints(Graphics2D g2d) {
-    g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
    g2d.setRenderingHint(
        RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
    g2d.setRenderingHint(
        RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
  }

-  public static final String safeAlphabets = "ABCDEFGHJKMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
-  public static final String allAlphabets = safeAlphabets + "ILlO";
-  public static final String safeNumbers = "23456789";
-  public static final String allNumbers = safeNumbers + "10";
-  public static final String specialCharacters = "$#%@&?";
-  public static final String safeAlphaNum = safeAlphabets + safeNumbers;
-  public static final String safeCharacters = safeAlphaNum + specialCharacters;
-
-  public static String randomString(final int n) {
-    return randomString(n, safeCharacters);
-  }
-
-  public static String randomString(final int n, final String characters) {
-    final StringBuilder stringBuilder = new StringBuilder();
+  public static String randomString(int n) {
+    String characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz23456789$#%@&?";
+    StringBuilder stringBuilder = new StringBuilder();
    for (int i = 0; i < n; i++) {
-      int index = randomNumber(characters.length());
+      int index = (int) (characters.length() * Math.random());
      stringBuilder.append(characters.charAt(index));
    }
    return stringBuilder.toString();
  }

-  public static synchronized int randomNumber(int min, int max) {
-    return random.nextInt((max - min) + 1) + min;
-  }
-
-  public static synchronized int randomNumber(int bound) {
-    return random.nextInt(bound);
+  public static int randomNumber(int min, int max) {
+    return (int) (Math.random() * ((max - min) + 1)) + min;
  }
 }
--- a/src/main/java/lc/misc/PngImageWriter.java
+++ b/src/main/java/lc/misc/PngImageWriter.java
@ -1,68 +0,0 @@
-package lc.misc;
-
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Iterator;
-import javax.imageio.IIOImage;
-import javax.imageio.ImageIO;
-import javax.imageio.ImageTypeSpecifier;
-import javax.imageio.ImageWriteParam;
-import javax.imageio.ImageWriter;
-import javax.imageio.metadata.IIOInvalidTreeException;
-import javax.imageio.metadata.IIOMetadata;
-import javax.imageio.metadata.IIOMetadataNode;
-import javax.imageio.stream.ImageOutputStream;
-
-public class PngImageWriter {
-
-  static final int DPI = 245;
-  static final double INCH_2_CM = 2.54;
-
-  public static void write(ByteArrayOutputStream boas, BufferedImage gridImage) throws IOException {
-    final String formatName = "png";
-    for (Iterator<ImageWriter> iw = ImageIO.getImageWritersByFormatName(formatName);
-        iw.hasNext(); ) {
-      ImageWriter writer = iw.next();
-      ImageWriteParam writeParam = writer.getDefaultWriteParam();
-      ImageTypeSpecifier typeSpecifier =
-          ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB);
-      IIOMetadata metadata = writer.getDefaultImageMetadata(typeSpecifier, writeParam);
-      if (metadata.isReadOnly() || !metadata.isStandardMetadataFormatSupported()) {
-        continue;
-      }
-
-      setDPIMeta(metadata);
-
-      final ImageOutputStream stream = ImageIO.createImageOutputStream(boas);
-      try {
-        writer.setOutput(stream);
-        writer.write(metadata, new IIOImage(gridImage, null, metadata), writeParam);
-      } finally {
-        stream.close();
-      }
-      break;
-    }
-  }
-
-  private static void setDPIMeta(IIOMetadata metadata) throws IIOInvalidTreeException {
-
-    // for PNG, it's dots per millimeter
-    double dotsPerMilli = 1.0 * DPI / 10 / INCH_2_CM;
-
-    IIOMetadataNode horiz = new IIOMetadataNode("HorizontalPixelSize");
-    horiz.setAttribute("value", Double.toString(dotsPerMilli));
-
-    IIOMetadataNode vert = new IIOMetadataNode("VerticalPixelSize");
-    vert.setAttribute("value", Double.toString(dotsPerMilli));
-
-    IIOMetadataNode dim = new IIOMetadataNode("Dimension");
-    dim.appendChild(horiz);
-    dim.appendChild(vert);
-
-    IIOMetadataNode root = new IIOMetadataNode("javax_imageio_1.0");
-    root.appendChild(dim);
-
-    metadata.mergeTree("javax_imageio_1.0", root);
-  }
-}
--- a/src/main/java/lc/server/HTTPServer.java
+++ b/src/main/java/lc/server/HTTPServer.java
--- a/src/main/java/org/limium/picoserve/Server.java
+++ b/src/main/java/org/limium/picoserve/Server.java
@ -1,289 +0,0 @@
-// Distributed under Apache 2 license
-// Copyright 2021 github.com/hrj
-
-package org.limium.picoserve;
-
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
-import com.sun.net.httpserver.HttpServer;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.Executor;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-public final class Server {
-  private final HttpServer server;
-
-  public static interface Response {
-    public int getCode();
-
-    public byte[] getBytes();
-
-    public Map<String, List<String>> getResponseHeaders();
-  }
-
-  public static class ByteResponse implements Response {
-    private final int code;
-    private final byte[] bytes;
-    private final Map<String, List<String>> responseHeaders;
-
-    public ByteResponse(final int code, final byte[] bytes) {
-      this.code = code;
-      this.bytes = bytes;
-      this.responseHeaders = null;
-    }
-
-    public ByteResponse(
-        final int code, final byte[] bytes, final Map<String, List<String>> responseHeaders) {
-      this.code = code;
-      this.bytes = bytes;
-      this.responseHeaders = responseHeaders;
-    }
-
-    public int getCode() {
-      return this.code;
-    }
-
-    public byte[] getBytes() {
-      return this.bytes;
-    }
-
-    public Map<String, List<String>> getResponseHeaders() {
-      return this.responseHeaders;
-    }
-  }
-
-  public static class StringResponse extends ByteResponse {
-    public StringResponse(final int code, final String msg) {
-      super(code, msg.getBytes());
-    }
-
-    public StringResponse(
-        final int code, final String msg, final Map<String, List<String>> responseHeaders) {
-      super(code, msg.getBytes(), responseHeaders);
-    }
-  }
-
-  public final class Request {
-    final HttpExchange exchange;
-
-    Request(final HttpExchange exchange) {
-      this.exchange = exchange;
-    }
-
-    public String getMethod() {
-      return exchange.getRequestMethod();
-    }
-
-    public Map<String, List<String>> getQueryParams() {
-      final var query = exchange.getRequestURI().getQuery();
-      final var params = parseParams(query);
-      return params;
-    }
-
-    public byte[] getBody() {
-      try (final var bodyIS = exchange.getRequestBody()) {
-        final var bytes = bodyIS.readAllBytes();
-        bodyIS.close();
-        return bytes;
-      } catch (IOException ioe) {
-        return null;
-      }
-    }
-
-    public String getBodyString() {
-      return new String(getBody());
-    }
-  }
-
-  @FunctionalInterface
-  public static interface Processor {
-    public Response process(final Request request);
-  }
-
-  public static class Handler {
-    public final String path;
-    public final Processor processor;
-    public final String[] methods;
-
-    public Handler(final String path, final Processor processor) {
-      this.path = path;
-      this.processor = processor;
-      this.methods = new String[] {};
-    }
-
-    public Handler(final String path, final String methods, final Processor processor) {
-      this.path = path;
-      this.processor = processor;
-      this.methods = methods.split(",");
-    }
-  }
-
-  public Server(
-      final InetSocketAddress addr,
-      final int backlog,
-      final List<Handler> handlers,
-      final Executor executor)
-      throws IOException {
-    this.server = HttpServer.create(addr, backlog);
-    this.server.setExecutor(executor);
-    for (final var handler : handlers) {
-      // System.out.println("Registering handler for " + handler.path);
-      this.server.createContext(
-          handler.path,
-          new HttpHandler() {
-            public void handle(final HttpExchange exchange) {
-              final var method = exchange.getRequestMethod();
-              final Response errorResponse = checkMethods(handler.methods, method);
-              try (final var os = exchange.getResponseBody()) {
-                Response response;
-                if (errorResponse != null) {
-                  response = errorResponse;
-                } else {
-                  try {
-                    response = handler.processor.process(new Request(exchange));
-                  } catch (final Exception e) {
-                    e.printStackTrace();
-                    response = new StringResponse(500, "Error: " + e);
-                  }
-                }
-                final var headersToSend = response.getResponseHeaders();
-                if (headersToSend != null) {
-                  final var responseHeaders = exchange.getResponseHeaders();
-                  responseHeaders.putAll(headersToSend);
-                }
-                final var bytes = response.getBytes();
-                final var code = response.getCode();
-                exchange.sendResponseHeaders(code, bytes.length);
-                os.write(bytes);
-                os.close();
-              } catch (IOException ioe) {
-                System.out.println("Error: " + ioe);
-              }
-            }
-          });
-    }
-  }
-
-  public static Response checkMethods(final String[] methods, final String method) {
-    if (methods.length > 0) {
-      var found = false;
-      for (var m : methods) {
-        if (m.equals(method)) {
-          found = true;
-          break;
-        }
-      }
-      if (!found) {
-        return new StringResponse(404, "Method Not Accepted");
-      }
-    }
-    return null;
-  }
-
-  public void start() {
-    this.server.start();
-  }
-
-  public void stop(int delay) {
-    this.server.stop(delay);
-  }
-
-  public static ServerBuilder builder() {
-    return new ServerBuilder();
-  }
-
-  // Adapted from https://stackoverflow.com/a/37368660
-  private static final Pattern ampersandPattern = Pattern.compile("&");
-  private static final Pattern equalPattern = Pattern.compile("=");
-  private static final Map<String, List<String>> emptyMap = Map.of();
-
-  private static Map<String, List<String>> parseParams(final String query) {
-    if (query == null) {
-      return emptyMap;
-    }
-    final var params =
-        ampersandPattern
-            .splitAsStream(query)
-            .map(s -> Arrays.copyOf(equalPattern.split(s, 2), 2))
-            .collect(
-                Collectors.groupingBy(
-                    s -> decode(s[0]), Collectors.mapping(s -> decode(s[1]), Collectors.toList())));
-    return params;
-  }
-
-  private static String decode(final String encoded) {
-    return Optional.ofNullable(encoded)
-        .map(e -> URLDecoder.decode(e, StandardCharsets.UTF_8))
-        .orElse(null);
-  }
-
-  public static class ServerBuilder {
-    private InetSocketAddress mAddress = new InetSocketAddress(9000);
-    private int backlog = 5;
-    private List<Handler> handlers = new LinkedList<Handler>();
-    private Executor executor = null;
-
-    public ServerBuilder port(final int port) {
-      mAddress = new InetSocketAddress(port);
-      return this;
-    }
-
-    public ServerBuilder backlog(final int backlog) {
-      this.backlog = backlog;
-      return this;
-    }
-
-    public ServerBuilder address(final InetSocketAddress addr) {
-      mAddress = addr;
-      return this;
-    }
-
-    public ServerBuilder handle(final Handler handler) {
-      handlers.add(handler);
-      return this;
-    }
-
-    public ServerBuilder GET(final String path, final Processor processor) {
-      handlers.add(new Handler(path, "GET", request -> processor.process(request)));
-      return this;
-    }
-
-    public ServerBuilder POST(final String path, final Processor processor) {
-      handlers.add(new Handler(path, "POST", request -> processor.process(request)));
-      return this;
-    }
-
-    public ServerBuilder PUT(final String path, final Processor processor) {
-      handlers.add(new Handler(path, "PUT", request -> processor.process(request)));
-      return this;
-    }
-
-    public ServerBuilder DELETE(final String path, final Processor processor) {
-      handlers.add(new Handler(path, "DELETE", request -> processor.process(request)));
-      return this;
-    }
-
-    public ServerBuilder HEAD(final String path, final Processor processor) {
-      handlers.add(new Handler(path, "HEAD", request -> processor.process(request)));
-      return this;
-    }
-
-    public ServerBuilder executor(final Executor executor) {
-      this.executor = executor;
-      return this;
-    }
-
-    public Server build() throws IOException {
-      return new Server(mAddress, backlog, handlers, executor);
-    }
-  }
-}
--- a/src/main/resources/index.html
+++ b/src/main/resources/index.html
@ -1,87 +0,0 @@
-<html>
-  <style>
-    body {background-color: #e7f7f7;}
-    button {background-color: #b4ffff; font-size:1.66em;}
-    input[type=text] {font-size:1.66em;}
-    div.inputGroup {margin: 1em}
-    div.section {border: .33em solid #0b6767; margin:1em; padding: 1em}
-  </style>
-
-<script>
-  function showError(errMessage) {
-    const resultDiv = document.getElementById("result")
-    const result = `
-      <p>Error: ${errMessage}</p>
-    `
-    resultDiv.innerHTML = result;
-  }
-
-  async function loadCaptcha() {
-    const levelInput = document.getElementById("levelInput").value
-    const mediaInput = document.getElementById("mediaInput").value
-    const typeInput = document.getElementById("typeInput").value
-    const sizeInput = document.getElementById("sizeInput").value
-    fetch("/v2/captcha", {
-       method: 'POST',
-       body: JSON.stringify({level: levelInput, media: mediaInput, "input_type" : typeInput, "size": sizeInput})
-    }).then(async function(resp) {
-      const respJson = await resp.json()
-      if (resp.ok) {
-        const id = respJson.id
-        const resultDiv = document.getElementById("result")
-        const result = `
-          <p>Id: ${id}</p>
-          <p><img src="/v2/media?id=${id}" /> </p>
-          <input type="text" id="answerInput" />
-          <button onClick="submitAnswer('${id}')">Submit</button>
-          <div id="answerResult" />
-        `
-        resultDiv.innerHTML = result;
-      } else {
-        showError("Failed with response code: " + resp.status + " response: " + JSON.stringify(respJson))
-      }
-    }).catch(showError)
-  }
-  async function submitAnswer(id) {
-    const ans = document.getElementById("answerInput").value;
-    const resp = await fetch("/v2/answer", {
-       method: 'POST',
-       body: JSON.stringify({id: id, answer: ans})
-    })
-    const respJson = await resp.json()
-    const resultDiv = document.getElementById("answerResult")
-    const result = `
-      <p>${JSON.stringify(respJson)}</p>
-    `
-    resultDiv.innerHTML = result;
-  }
-
-</script>
-<body>
-  <div class="section">
-    <div class="inputGroup">
-      <span>Level</span>
-      <input type="text" id="levelInput" value="easy"/>
-    </div>
-    <div class="inputGroup">
-      <span>Media</span>
-      <input type="text" id="mediaInput" value="image/png" />
-    </div>
-    <div class="inputGroup">
-      <span>Input Type</span>
-      <input type="text" id="typeInput" value="text" />
-    </div>
-    <div class="inputGroup">
-      <span>Input Size</span>
-      <input type="text" id="sizeInput" value="350x100" />
-    </div>
-    <div class="inputGroup">
-      <button onClick="loadCaptcha()">Get New CAPTCHA</button>
-    </div>
-  </div>
-  <div class="section">
-    <div id="result">...</div>
-  </div>
-</body>
-
-</html>
--- a/src/main/scala/lc/Main.scala
+++ b/src/main/scala/lc/Main.scala
@ -1,59 +1,35 @@
 package lc

-import lc.core.{CaptchaProviders, CaptchaManager, Config}
+import lc.core.{Captcha, CaptchaProviders}
 import lc.server.Server
 import lc.background.BackgroundTask
-import lc.database.Statements
+import lc.core.Config

 object LCFramework {
  def main(args: scala.Array[String]): Unit = {
-    val configFilePath = if (args.length > 0) {
-      args(0)
-    } else {
-      "data/config.json"
-    }
-    val config = new Config(configFilePath)
-    Statements.maxAttempts = config.maxAttempts
-    val captchaProviders = new CaptchaProviders(config = config)
-    val captchaManager = new CaptchaManager(config = config, captchaProviders = captchaProviders)
-    val backgroundTask = new BackgroundTask(config = config, captchaManager = captchaManager)
-    backgroundTask.beginThread(delay = config.threadDelay)
-    val server = new Server(
-      address = config.address,
-      port = config.port,
-      captchaManager = captchaManager,
-      playgroundEnabled = config.playgroundEnabled,
-      corsHeader = config.corsHeader
+    val captcha = new Captcha()
+    val server = new Server(port = Config.port, captcha = captcha)
+    val backgroundTask = new BackgroundTask(
+      captcha = captcha,
+      throttle = Config.throttle,
+      timeLimit = Config.captchaExpiryTimeLimit
    )
-
-    Runtime.getRuntime.addShutdownHook(new Thread {
-      override def run(): Unit = {
-        println("Shutting down gracefully...")
-        backgroundTask.shutdown()
-      }
-    })
-
+    backgroundTask.beginThread(delay = Config.threadDelay)
    server.start()
  }
 }

 object MakeSamples {
  def main(args: scala.Array[String]): Unit = {
-    val configFilePath = if (args.length > 0) {
-      args(0)
-    } else {
-      "data/config.json"
-    }
-    val config = new Config(configFilePath)
-    val captchaProviders = new CaptchaProviders(config = config)
-    val samples = captchaProviders.generateChallengeSamples()
-    samples.foreach { case (key, sample) =>
-      val extensionMap = Map("image/png" -> "png", "image/gif" -> "gif")
-      println(key + ": " + sample)
+    val samples = CaptchaProviders.generateChallengeSamples()
+    samples.foreach {
+      case (key, sample) =>
+        val extensionMap = Map("image/png" -> "png", "image/gif" -> "gif")
+        println(key + ": " + sample)

-      val outStream = new java.io.FileOutputStream("samples/" + key + "." + extensionMap(sample.contentType))
-      outStream.write(sample.content)
-      outStream.close
+        val outStream = new java.io.FileOutputStream("samples/" + key + "." + extensionMap(sample.contentType))
+        outStream.write(sample.content)
+        outStream.close
    }
  }
 }
--- a/src/main/scala/lc/background/taskThread.scala
+++ b/src/main/scala/lc/background/taskThread.scala
@ -2,89 +2,37 @@ package lc.background

 import lc.database.Statements
 import java.util.concurrent.{ScheduledThreadPoolExecutor, TimeUnit}
-import lc.core.{CaptchaManager, Config}
+import lc.core.Captcha
 import lc.core.{Parameters, Size}
-import lc.misc.HelperFunctions

-class BackgroundTask(config: Config, captchaManager: CaptchaManager) {
+class BackgroundTask(captcha: Captcha, throttle: Int, timeLimit: Int) {

  private val task = new Runnable {
    def run(): Unit = {
      try {
+
        val mapIdGCPstmt = Statements.tlStmts.get.mapIdGCPstmt
-        mapIdGCPstmt.setInt(1, config.captchaExpiryTimeLimit)
+        mapIdGCPstmt.setInt(1, timeLimit)
        mapIdGCPstmt.executeUpdate()

        val challengeGCPstmt = Statements.tlStmts.get.challengeGCPstmt
        challengeGCPstmt.executeUpdate()

-        val allCombinations = allParameterCombinations()
-        val requiredCountPerCombination = Math.max(1, (config.bufferCount * 1.01) / allCombinations.size).toInt
-
-        for (param <- allCombinations) {
-          if (!shutdownInProgress) {
-            val countExisting = captchaManager.getCount(param).getOrElse(0)
-            val countRequired = requiredCountPerCombination - countExisting
-            if (countRequired > 0) {
-              val countCreate = Math.min(1.0 + requiredCountPerCombination / 10.0, countRequired).toInt
-              println(s"Creating $countCreate of $countRequired captchas for $param")
-
-              for (i <- 0 until countCreate) {
-                if (!shutdownInProgress) {
-                  captchaManager.generateChallenge(param)
-                }
-              }
-            }
-          }
+        val imageNum = Statements.tlStmts.get.getCountChallengeTable.executeQuery()
+        var throttleIn = (throttle * 1.1).toInt
+        if (imageNum.next())
+          throttleIn = (throttleIn - imageNum.getInt("total"))
+        while (0 < throttleIn) {
+          captcha.generateChallenge(Parameters("medium", "image/png", "text", Option(Size(0, 0))))
+          throttleIn -= 1
        }
-      } catch { case exception: Exception => println(exception) }
+      } catch { case e: Exception => println(e) }
    }
  }

-  private def allParameterCombinations(): List[Parameters] = {
-    (config.captchaConfig).flatMap { captcha =>
-      (captcha.allowedLevels).flatMap { level =>
-        (captcha.allowedMedia).flatMap { media =>
-          (captcha.allowedInputType).flatMap { inputType =>
-            (captcha.allowedSizes).map { size =>
-              Parameters(level, media, inputType, size)
-            }
-          }
-        }
-      }
-    }
-  }
-
-  private def getRandomParam(): Parameters = {
-    val captcha = pickRandom(config.captchaConfig)
-    val level = pickRandom(captcha.allowedLevels)
-    val media = pickRandom(captcha.allowedMedia)
-    val inputType = pickRandom(captcha.allowedInputType)
-    val size = pickRandom(captcha.allowedSizes)
-
-    Parameters(level, media, inputType, size)
-  }
-
-  private def pickRandom[T](list: List[T]): T = {
-    list(HelperFunctions.randomNumber(list.size))
-  }
-
-  private val ex = new ScheduledThreadPoolExecutor(1)
-
  def beginThread(delay: Int): Unit = {
+    val ex = new ScheduledThreadPoolExecutor(1)
    ex.scheduleWithFixedDelay(task, 1, delay, TimeUnit.SECONDS)
  }

-  @volatile var shutdownInProgress = false
-
-  def shutdown(): Unit = {
-    println("  Shutting down background task...")
-    shutdownInProgress = true
-    ex.shutdown()
-    println("    Finished Shutting background task")
-    println("  Shutting down DB...")
-    Statements.tlStmts.get.shutdown.execute()
-    println("    Finished shutting down db")
-  }
-
 }
--- a/src/main/scala/lc/captchas/DebugCaptcha.scala
+++ b/src/main/scala/lc/captchas/DebugCaptcha.scala
@ -1,76 +0,0 @@
-package lc.captchas
-
-import java.awt.Color
-import java.awt.Font
-import java.awt.font.TextLayout
-import java.awt.image.BufferedImage
-import java.io.ByteArrayOutputStream
-import java.util.Map
-import java.util.List
-
-import lc.misc.HelperFunctions
-import lc.captchas.interfaces.Challenge
-import lc.captchas.interfaces.ChallengeProvider
-import lc.misc.PngImageWriter
-
-/** This captcha is only for debugging purposes. It creates very simple captchas that are deliberately easy to solve
-  * with OCR engines
-  */
-class DebugCaptcha extends ChallengeProvider {
-
-  def getId(): String = {
-    "DebugCaptcha"
-  }
-
-  def configure(config: String): Unit = {
-    // TODO: Add custom config
-  }
-
-  def supportedParameters(): Map[String, List[String]] = {
-    Map.of(
-      "supportedLevels",
-      List.of("debug"),
-      "supportedMedia",
-      List.of("image/png"),
-      "supportedInputType",
-      List.of("text")
-    )
-  }
-
-  def checkAnswer(secret: String, answer: String): Boolean = {
-    val matches = answer.toLowerCase().replaceAll(" ", "").equals(secret)
-    if (!matches) {
-      println(s"Didn't match, answer: '$answer' to secret '$secret'")
-    }
-    matches
-  }
-
-  private def simpleText(width: Int, height: Int, text: String): Array[Byte] = {
-    val img = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB)
-    val font = new Font("Arial", Font.ROMAN_BASELINE, 56)
-    val graphics2D = img.createGraphics()
-    val textLayout = new TextLayout(text, font, graphics2D.getFontRenderContext())
-    HelperFunctions.setRenderingHints(graphics2D)
-    graphics2D.setPaint(Color.WHITE)
-    graphics2D.fillRect(0, 0, width, height)
-    graphics2D.setPaint(Color.BLACK)
-    textLayout.draw(graphics2D, 15, 50)
-    graphics2D.dispose()
-    val baos = new ByteArrayOutputStream()
-    try {
-      PngImageWriter.write(baos, img);
-    } catch {
-      case e: Exception =>
-        e.printStackTrace()
-    }
-    baos.toByteArray()
-  }
-
-  def returnChallenge(level: String, size: String): Challenge = {
-    val secret = HelperFunctions.randomString(6, HelperFunctions.safeAlphabets)
-    val size2D = HelperFunctions.parseSize2D(size)
-    val width = size2D(0)
-    val height = size2D(1)
-    new Challenge(simpleText(width, height, secret), "image/png", secret.toLowerCase())
-  }
-}
--- a/src/main/scala/lc/captchas/FilterChallenge.scala
+++ b/src/main/scala/lc/captchas/FilterChallenge.scala
@ -7,10 +7,8 @@ import java.awt.Font
 import java.awt.Color
 import lc.captchas.interfaces.ChallengeProvider
 import lc.captchas.interfaces.Challenge
+import scala.jdk.CollectionConverters.MapHasAsJava
 import java.util.{List => JavaList, Map => JavaMap}
-import java.io.ByteArrayOutputStream
-import lc.misc.PngImageWriter
-import lc.misc.HelperFunctions

 class FilterChallenge extends ChallengeProvider {
  def getId = "FilterChallenge"
@ -20,49 +18,33 @@ class FilterChallenge extends ChallengeProvider {
  }

  def supportedParameters(): JavaMap[String, JavaList[String]] = {
-    JavaMap.of(
-      "supportedLevels",
-      JavaList.of("medium", "hard"),
-      "supportedMedia",
-      JavaList.of("image/png"),
-      "supportedInputType",
-      JavaList.of("text")
-    )
+    val supportedParams = Map(
+      "supportedLevels" -> JavaList.of("medium", "hard"),
+      "supportedMedia" -> JavaList.of("image/png"),
+      "supportedInputType" -> JavaList.of("text")
+    ).asJava
+
+    supportedParams
  }

-  private val filterTypes = List(new FilterType1, new FilterType2)
-
-  def returnChallenge(level: String, size: String): Challenge = {
-    val mediumLevel = level == "medium"
+  def returnChallenge(): Challenge = {
+    val filterTypes = List(new FilterType1, new FilterType2)
    val r = new scala.util.Random
-    val characters = if (mediumLevel) HelperFunctions.safeAlphaNum else HelperFunctions.safeCharacters
-    val n = if (mediumLevel) 5 else 7
-    val secret = LazyList.continually(r.nextInt(characters.size)).map(characters).take(n).mkString
-    val size2D = HelperFunctions.parseSize2D(size)
-    val width = size2D(0)
-    val height = size2D(1)
-    val canvas = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB)
+    val alphabet = "abcdefghijklmnopqrstuvwxyz"
+    val n = 8
+    val secret = LazyList.continually(r.nextInt(alphabet.size)).map(alphabet).take(n).mkString
+    val canvas = new BufferedImage(225, 50, BufferedImage.TYPE_INT_RGB)
    val g = canvas.createGraphics()
-    val fontHeight = (height * 0.6).toInt
    g.setColor(Color.WHITE)
    g.fillRect(0, 0, canvas.getWidth, canvas.getHeight)
    g.setColor(Color.BLACK)
-    val font = new Font("Serif", Font.BOLD, fontHeight)
-    g.setFont(font)
-    val stringWidth = g.getFontMetrics().stringWidth(secret)
-    val scaleX = if (stringWidth > width) width / (stringWidth.toDouble) else 1d
-    val margin = if (stringWidth > width) 0 else (width - stringWidth)
-    val xOffset = (margin * r.nextDouble).toInt
-    g.scale(scaleX, 1d)
-    g.drawString(secret, xOffset, fontHeight)
+    g.setFont(new Font("Serif", Font.PLAIN, 30))
+    g.drawString(secret, 5, 30)
    g.dispose()
    var image = ImmutableImage.fromAwt(canvas)
-    val s = r.nextInt(2)
-    image = filterTypes(s).applyFilter(image, !mediumLevel)
-    val img = image.awt()
-    val baos = new ByteArrayOutputStream()
-    PngImageWriter.write(baos, img);
-    new Challenge(baos.toByteArray, "image/png", secret)
+    val s = scala.util.Random.nextInt(2)
+    image = filterTypes(s).applyFilter(image)
+    new Challenge(image.bytes(new nio.PngWriter()), "image/png", secret)
  }
  def checkAnswer(secret: String, answer: String): Boolean = {
    secret == answer
@ -70,15 +52,14 @@ class FilterChallenge extends ChallengeProvider {
 }

 trait FilterType {
-  def applyFilter(image: ImmutableImage, hardLevel: Boolean): ImmutableImage
+  def applyFilter(image: ImmutableImage): ImmutableImage
 }

 class FilterType1 extends FilterType {
-  override def applyFilter(image: ImmutableImage, hardLevel: Boolean): ImmutableImage = {
-    val radius = if (hardLevel) 3 else 2
-    val blur = new GaussianBlurFilter(radius)
+  override def applyFilter(image: ImmutableImage): ImmutableImage = {
+    val blur = new GaussianBlurFilter(2)
    val smear = new SmearFilter(com.sksamuel.scrimage.filter.SmearType.Circles, 10, 10, 10, 0, 1)
-    val diffuse = new DiffuseFilter(radius.toFloat)
+    val diffuse = new DiffuseFilter(2)
    blur.apply(image)
    diffuse.apply(image)
    smear.apply(image)
@ -87,10 +68,9 @@ class FilterType1 extends FilterType {
 }

 class FilterType2 extends FilterType {
-  override def applyFilter(image: ImmutableImage, hardLevel: Boolean): ImmutableImage = {
-    val radius = if (hardLevel) 2f else 1f
+  override def applyFilter(image: ImmutableImage): ImmutableImage = {
    val smear = new SmearFilter(com.sksamuel.scrimage.filter.SmearType.Circles, 10, 10, 10, 0, 1)
-    val diffuse = new DiffuseFilter(radius)
+    val diffuse = new DiffuseFilter(1)
    val ripple = new RippleFilter(com.sksamuel.scrimage.filter.RippleType.Noise, 1, 1, 0.005.toFloat, 0.005.toFloat)
    diffuse.apply(image)
    ripple.apply(image)
--- a/src/main/scala/lc/captchas/LabelCaptcha.scala
+++ b/src/main/scala/lc/captchas/LabelCaptcha.scala
@ -9,8 +9,8 @@ import java.awt.image.BufferedImage
 import java.awt.Color
 import lc.captchas.interfaces.ChallengeProvider
 import lc.captchas.interfaces.Challenge
+import scala.jdk.CollectionConverters.MapHasAsJava
 import java.util.{List => JavaList, Map => JavaMap}
-import lc.misc.PngImageWriter

 class LabelCaptcha extends ChallengeProvider {
  private var knownFiles = new File("known").list.toList
@ -30,17 +30,16 @@ class LabelCaptcha extends ChallengeProvider {
  }

  def supportedParameters(): JavaMap[String, JavaList[String]] = {
-    JavaMap.of(
-      "supportedLevels",
-      JavaList.of("hard"),
-      "supportedMedia",
-      JavaList.of("image/png"),
-      "supportedInputType",
-      JavaList.of("text")
-    )
+    val supportedParams = Map(
+      "supportedLevels" -> JavaList.of("hard"),
+      "supportedMedia" -> JavaList.of("image/png"),
+      "supportedInputType" -> JavaList.of("text")
+    ).asJava
+
+    supportedParams
  }

-  def returnChallenge(level: String, size: String): Challenge =
+  def returnChallenge(): Challenge =
    synchronized {
      val r = scala.util.Random.nextInt(knownFiles.length)
      val s = scala.util.Random.nextInt(unknownFiles.length)
@ -53,7 +52,7 @@ class LabelCaptcha extends ChallengeProvider {

      val token = encrypt(knownImageFile + "," + unknownImageFile)
      val baos = new ByteArrayOutputStream()
-      PngImageWriter.write(baos, mergedImage);
+      ImageIO.write(mergedImage, "png", baos)

      new Challenge(baos.toByteArray(), "image/png", token)
    }
--- a/src/main/scala/lc/captchas/RainDropsCaptcha.scala
+++ b/src/main/scala/lc/captchas/RainDropsCaptcha.scala
@ -10,8 +10,8 @@ import javax.imageio.stream.MemoryCacheImageOutputStream;
 import lc.captchas.interfaces.ChallengeProvider
 import lc.captchas.interfaces.Challenge
 import lc.misc.GifSequenceWriter
+import scala.jdk.CollectionConverters.MapHasAsJava
 import java.util.{List => JavaList, Map => JavaMap}
-import lc.misc.HelperFunctions

 class Drop {
  var x = 0
@ -25,6 +25,8 @@ class Drop {
 }

 class RainDropsCP extends ChallengeProvider {
+  private val alphabet = "abcdefghijklmnopqrstuvwxyz"
+  private val n = 6
  private val bgColor = new Color(200, 200, 200)
  private val textColor = new Color(208, 208, 218)
  private val textHighlightColor = new Color(100, 100, 125)
@ -36,14 +38,13 @@ class RainDropsCP extends ChallengeProvider {
  }

  def supportedParameters(): JavaMap[String, JavaList[String]] = {
-    JavaMap.of(
-      "supportedLevels",
-      JavaList.of("medium", "easy"),
-      "supportedMedia",
-      JavaList.of("image/gif"),
-      "supportedInputType",
-      JavaList.of("text")
-    )
+    val supportedParams = Map(
+      "supportedLevels" -> JavaList.of("medium", "easy"),
+      "supportedMedia" -> JavaList.of("image/gif"),
+      "supportedInputType" -> JavaList.of("text")
+    ).asJava
+
+    supportedParams
  }

  private def extendDrops(drops: Array[Drop], steps: Int, xOffset: Int) = {
@ -55,13 +56,11 @@ class RainDropsCP extends ChallengeProvider {
    })
  }

-  def returnChallenge(level: String, size: String): Challenge = {
+  def returnChallenge(): Challenge = {
    val r = new scala.util.Random
-    val n = if (level == "easy") 4 else 6
-    val secret = HelperFunctions.randomString(n, HelperFunctions.safeAlphaNum)
-    val size2D = HelperFunctions.parseSize2D(size)
-    val width = size2D(0)
-    val height = size2D(1)
+    val secret = LazyList.continually(r.nextInt(alphabet.size)).map(alphabet).take(n).mkString
+    val width = 450
+    val height = 100
    val imgType = BufferedImage.TYPE_INT_RGB
    val xOffset = 2 + r.nextInt(3)
    val xBias = (height / 10) - 2
@ -81,8 +80,7 @@ class RainDropsCP extends ChallengeProvider {
      xOffset
    )

-    val fontHeight = (height * 0.5f).toInt
-    val baseFont = new Font(Font.MONOSPACED, Font.BOLD, fontHeight)
+    val baseFont = new Font(Font.MONOSPACED, Font.BOLD, 80)
    val attributes = new java.util.HashMap[TextAttribute, Object]()
    attributes.put(TextAttribute.TRACKING, Double.box(0.2))
    attributes.put(TextAttribute.WEIGHT, TextAttribute.WEIGHT_EXTRABOLD)
@ -119,22 +117,17 @@ class RainDropsCP extends ChallengeProvider {
        }
      }

-      g.setFont(spacedFont)
-      val textWidth = g.getFontMetrics().stringWidth(secret)
-      val scaleX = if (textWidth > width) width / textWidth.toDouble else 1.0d
-      g.scale(scaleX, 1)
-
      // center the text
-      val textX = if (textWidth > width) 0 else ((width - textWidth) / 2)
+      g.setFont(spacedFont)
+      val textWidth = g.getFontMetrics().charsWidth(secret.toCharArray, 0, secret.toCharArray.length)
+      val textX = (width - textWidth) / 2

-      // this will be overlapped by the following text to show the top outline because of the offset
-      val yOffset = (fontHeight * 0.01).ceil.toInt
+      // paint the top outline
      g.setColor(textHighlightColor)
-      g.drawString(secret, textX, (fontHeight * 1.1).toInt - yOffset)
-
+      g.drawString(secret, textX, 69)
      // paint the text
      g.setColor(textColor)
-      g.drawString(secret, textX, (fontHeight * 1.1).toInt)
+      g.drawString(secret, textX, 70)

      g.dispose()
      writer.writeToSequence(canvas)
--- a/src/main/scala/lc/core/captcha.scala
+++ b/src/main/scala/lc/core/captcha.scala
@ -0,0 +1,155 @@
+package lc.core
+
+import java.sql.{Blob, ResultSet}
+import java.util.UUID
+import java.io.ByteArrayInputStream
+import lc.database.Statements
+import lc.core.CaptchaProviders
+import lc.captchas.interfaces.ChallengeProvider
+
+class Captcha {
+
+  def getCaptcha(id: Id): Array[Byte] = {
+    var image: Array[Byte] = null
+    var blob: Blob = null
+    try {
+      val imagePstmt = Statements.tlStmts.get.imagePstmt
+      imagePstmt.setString(1, id.id)
+      val rs: ResultSet = imagePstmt.executeQuery()
+      if (rs.next()) {
+        blob = rs.getBlob("image")
+        if (blob != null) {
+          image = blob.getBytes(1, blob.length().toInt)
+        }
+      }
+      image
+    } catch {
+      case e: Exception =>
+        println(e)
+        image
+    }
+  }
+
+  def generateChallenge(param: Parameters): Int = {
+    val provider = CaptchaProviders.getProvider(param)
+    if (!provider.isInstanceOf[ChallengeProvider]) return -1
+    val providerId = provider.getId()
+    val challenge = provider.returnChallenge()
+    val blob = new ByteArrayInputStream(challenge.content)
+    val insertPstmt = Statements.tlStmts.get.insertPstmt
+    insertPstmt.setString(1, provider.getId)
+    insertPstmt.setString(2, challenge.secret)
+    insertPstmt.setString(3, providerId)
+    insertPstmt.setString(4, challenge.contentType)
+    insertPstmt.setString(5, param.level)
+    insertPstmt.setString(6, param.input_type)
+    insertPstmt.setBlob(7, blob)
+    insertPstmt.executeUpdate()
+    val rs: ResultSet = insertPstmt.getGeneratedKeys()
+    val token = if (rs.next()) {
+      rs.getInt("token")
+    }
+    println("Added new challenge: " + token.toString)
+    token.asInstanceOf[Int]
+  }
+
+  val allowedInputType = Config.allowedInputType
+  val allowedLevels = Config.allowedLevels
+  val allowedMedia = Config.allowedMedia
+
+  private def validateParam(param: Parameters): Boolean = {
+    if (
+      allowedLevels.contains(param.level) &&
+      allowedMedia.contains(param.media) &&
+      allowedInputType.contains(param.input_type)
+    )
+      return true
+    else
+      return false
+  }
+
+  def getChallenge(param: Parameters): ChallengeResult = {
+    try {
+      val validParam = validateParam(param)
+      if (validParam) {
+        val tokenPstmt = Statements.tlStmts.get.tokenPstmt
+        tokenPstmt.setString(1, param.level)
+        tokenPstmt.setString(2, param.media)
+        tokenPstmt.setString(3, param.input_type)
+        val rs = tokenPstmt.executeQuery()
+        val tokenOpt = if (rs.next()) {
+          Some(rs.getInt("token"))
+        } else {
+          None
+        }
+        val updateAttemptedPstmt = Statements.tlStmts.get.updateAttemptedPstmt
+        val token = tokenOpt.getOrElse(generateChallenge(param))
+        val result = if (token != -1) {
+          val uuid = getUUID(token)
+          updateAttemptedPstmt.setString(1, uuid)
+          updateAttemptedPstmt.executeUpdate()
+          Id(uuid)
+        } else {
+          Error(ErrorMessageEnum.NO_CAPTCHA.toString)
+        }
+        result
+      } else {
+        Error(ErrorMessageEnum.INVALID_PARAM.toString)
+      }
+    } catch {
+      case e: Exception =>
+        println(e)
+        Error(ErrorMessageEnum.SMW.toString)
+    }
+  }
+
+  private def getUUID(id: Int): String = {
+    val uuid = UUID.randomUUID().toString
+    val mapPstmt = Statements.tlStmts.get.mapPstmt
+    mapPstmt.setString(1, uuid)
+    mapPstmt.setInt(2, id)
+    mapPstmt.executeUpdate()
+    uuid
+  }
+
+  def checkAnswer(answer: Answer): Result = {
+    val selectPstmt = Statements.tlStmts.get.selectPstmt
+    selectPstmt.setInt(1, Config.captchaExpiryTimeLimit)
+    selectPstmt.setString(2, answer.id)
+    val rs: ResultSet = selectPstmt.executeQuery()
+    val psOpt = if (rs.first()) {
+      val secret = rs.getString("secret")
+      val provider = rs.getString("provider")
+      val check = CaptchaProviders.getProviderById(provider).checkAnswer(secret, answer.answer)
+      val result = if (check) ResultEnum.TRUE.toString else ResultEnum.FALSE.toString
+      result
+    } else {
+      ResultEnum.EXPIRED.toString
+    }
+    val deleteAnswerPstmt = Statements.tlStmts.get.deleteAnswerPstmt
+    deleteAnswerPstmt.setString(1, answer.id)
+    deleteAnswerPstmt.executeUpdate()
+    Result(psOpt)
+  }
+
+  def display(): Unit = {
+    val rs: ResultSet = Statements.tlStmts.get.getChallengeTable.executeQuery()
+    println("token\t\tid\t\tsecret\t\tattempted")
+    while (rs.next()) {
+      val token = rs.getInt("token")
+      val id = rs.getString("id")
+      val secret = rs.getString("secret")
+      val attempted = rs.getString("attempted")
+      println(s"${token}\t\t${id}\t\t${secret}\t\t${attempted}\n\n")
+    }
+
+    val rss: ResultSet = Statements.tlStmts.get.getMapIdTable.executeQuery()
+    println("uuid\t\ttoken\t\tlastServed")
+    while (rss.next()) {
+      val uuid = rss.getString("uuid")
+      val token = rss.getInt("token")
+      val lastServed = rss.getTimestamp("lastServed")
+      println(s"${uuid}\t\t${token}\t\t${lastServed}\n\n")
+    }
+  }
+}
--- a/src/main/scala/lc/core/captchaFields.scala
+++ b/src/main/scala/lc/core/captchaFields.scala
@ -10,7 +10,7 @@ object ParametersEnum extends Enumeration {
  val ALLOWEDLEVELS: Value = Value("allowedLevels")
  val ALLOWEDMEDIA: Value = Value("allowedMedia")
  val ALLOWEDINPUTTYPE: Value = Value("allowedInputType")
-  val ALLOWEDSIZES: Value = Value("allowedSizes")
+
 }

 object AttributesEnum extends Enumeration {
@ -19,14 +19,10 @@ object AttributesEnum extends Enumeration {
  val NAME: Value = Value("name")
  val RANDOM_SEED: Value = Value("randomSeed")
  val PORT: Value = Value("port")
-  val ADDRESS: Value = Value("address")
  val CAPTCHA_EXPIRY_TIME_LIMIT: Value = Value("captchaExpiryTimeLimit")
-  val BUFFER_COUNT: Value = Value("bufferCount")
+  val THROTTLE: Value = Value("throttle")
  val THREAD_DELAY: Value = Value("threadDelay")
-  val PLAYGROUND_ENABLED: Value = Value("playgroundEnabled")
-  val CORS_HEADER: Value = Value("corsHeader")
  val CONFIG: Value = Value("config")
-  val MAX_ATTEMPTS_RATIO: Value = Value("maxAttemptsRatio")
 }

 object ResultEnum extends Enumeration {
@ -41,9 +37,6 @@ object ErrorMessageEnum extends Enumeration {
  type ErrorMessage = Value

  val SMW: Value = Value("Oops, something went worng!")
-  val INVALID_PARAM: Value = Value("Parameters invalid or missing")
-  val IMG_MISSING: Value = Value("Image missing")
-  val IMG_NOT_FOUND: Value = Value("Image not found")
-  val NO_CAPTCHA: Value = Value("No captcha for the provided parameters. Change config options.")
-  val BAD_METHOD: Value = Value("Bad request method")
+  val INVALID_PARAM: Value = Value("Invalid Pramaters")
+  val NO_CAPTCHA: Value = Value("No captcha for the provided parameters")
 }
--- a/src/main/scala/lc/core/captchaManager.scala
+++ b/src/main/scala/lc/core/captchaManager.scala
@ -1,214 +0,0 @@
-package lc.core
-
-import lc.captchas.interfaces.{Challenge, ChallengeProvider}
-import lc.database.Statements
-import java.io.ByteArrayInputStream
-import java.sql.{Blob, ResultSet}
-import java.util.UUID
-
-class CaptchaManager(config: Config, captchaProviders: CaptchaProviders) {
-
-  def getCaptcha(id: Id): Either[Error, Image] = {
-    val blob = getImage(id.id)
-    blob match {
-      case Some(value) => {
-        if (blob != null) {
-          Right(Image(value.getBytes(1, value.length().toInt)))
-        } else {
-          Left(Error(ErrorMessageEnum.IMG_MISSING.toString))
-        }
-      }
-      case None => Left(Error(ErrorMessageEnum.IMG_NOT_FOUND.toString))
-    }
-  }
-
-  private def getImage(id: String): Option[Blob] = {
-    val imagePstmt = Statements.tlStmts.get.imagePstmt
-    imagePstmt.setString(1, id)
-    val rs: ResultSet = imagePstmt.executeQuery()
-    if (rs.next()) {
-      Some(rs.getBlob("image"))
-    } else {
-      None
-    }
-  }
-
-  def generateChallenge(param: Parameters): Option[Int] = {
-    try {
-      captchaProviders.getProvider(param).flatMap { provider =>
-        val providerId = provider.getId()
-        val challenge = provider.returnChallenge(param.level, param.size)
-        val blob = new ByteArrayInputStream(challenge.content)
-        val token = insertCaptcha(provider, challenge, providerId, param, blob)
-        // println("Added new challenge: " + token.toString)
-        token.map(_.toInt)
-      }
-    } catch {
-      case e: Exception =>
-        e.printStackTrace()
-        None
-    }
-  }
-
-  private def insertCaptcha(
-      provider: ChallengeProvider,
-      challenge: Challenge,
-      providerId: String,
-      param: Parameters,
-      blob: ByteArrayInputStream
-  ): Option[Int] = {
-    val insertPstmt = Statements.tlStmts.get.insertPstmt
-    insertPstmt.setString(1, provider.getId)
-    insertPstmt.setString(2, challenge.secret)
-    insertPstmt.setString(3, providerId)
-    insertPstmt.setString(4, challenge.contentType)
-    insertPstmt.setString(5, param.level)
-    insertPstmt.setString(6, param.input_type)
-    insertPstmt.setString(7, param.size)
-    insertPstmt.setBlob(8, blob)
-    insertPstmt.executeUpdate()
-    val rs: ResultSet = insertPstmt.getGeneratedKeys()
-    if (rs.next()) {
-      Some(rs.getInt("token"))
-    } else {
-      None
-    }
-  }
-
-  val allowedInputType = config.allowedInputType
-  val allowedLevels = config.allowedLevels
-  val allowedMedia = config.allowedMedia
-
-  private def validateParam(param: Parameters): Array[String] = {
-    var invalid_params = Array[String]()
-    if (!allowedLevels.contains(param.level)) invalid_params :+= "level"
-    if (!allowedMedia.contains(param.media)) invalid_params :+= "media"
-    if (!allowedInputType.contains(param.input_type)) invalid_params :+= "input_type"
-
-    invalid_params
-  }
-
-  def getChallenge(param: Parameters): Either[Error, Id] = {
-    val validParam = validateParam(param)
-    if (validParam.isEmpty) {
-      val tokenOpt = getToken(param)
-      val token = tokenOpt.orElse(generateChallenge(param))
-      token match {
-        case Some(value) => {
-          val uuid = getUUID(value)
-          updateAttempted(value)
-          Right(Id(uuid))
-        }
-        case None => {
-          Left(Error(ErrorMessageEnum.NO_CAPTCHA.toString))
-        }
-      }
-    } else {
-      Left(Error(ErrorMessageEnum.INVALID_PARAM.toString + " => " + validParam.mkString(", ")))
-    }
-  }
-
-  def getCount(param: Parameters): Option[Int] = {
-    val countPstmt = Statements.tlStmts.get.countForParameterPstmt
-    countPstmt.setString(1, param.level)
-    countPstmt.setString(2, param.media)
-    countPstmt.setString(3, param.input_type)
-    countPstmt.setString(4, param.size.toString())
-    val rs = countPstmt.executeQuery()
-    if (rs.next()) {
-      Some(rs.getInt("count"))
-    } else {
-      None
-    }
-  }
-
-  private def getToken(param: Parameters): Option[Int] = {
-    val count = getCount(param).getOrElse(0)
-    if (count == 0) {
-      None
-    } else {
-      val tokenPstmt = Statements.tlStmts.get.tokenPstmt
-      tokenPstmt.setString(1, param.level)
-      tokenPstmt.setString(2, param.media)
-      tokenPstmt.setString(3, param.input_type)
-      tokenPstmt.setString(4, param.size)
-      tokenPstmt.setInt(5, count)
-      val rs = tokenPstmt.executeQuery()
-      if (rs.next()) {
-        Some(rs.getInt("token"))
-      } else {
-        None
-      }
-    }
-  }
-
-  private def updateAttempted(token: Int): Unit = {
-    val updateAttemptedPstmt = Statements.tlStmts.get.updateAttemptedPstmt
-    updateAttemptedPstmt.setInt(1, token)
-    updateAttemptedPstmt.executeUpdate()
-  }
-
-  private def getUUID(id: Int): String = {
-    val uuid = UUID.randomUUID().toString
-    val mapPstmt = Statements.tlStmts.get.mapPstmt
-    mapPstmt.setString(1, uuid)
-    mapPstmt.setInt(2, id)
-    mapPstmt.executeUpdate()
-    uuid
-  }
-
-  def checkAnswer(answer: Answer): Either[Error, Success] = {
-    val challenge = getSecret(answer.id)
-    challenge match {
-      case None => Right(Success(ResultEnum.EXPIRED.toString))
-      case Some(value) => {
-        val (provider, secret) = value
-        val check = captchaProviders.getProviderById(provider).checkAnswer(secret, answer.answer)
-        deleteCaptcha(answer.id)
-        val result = if (check) ResultEnum.TRUE.toString else ResultEnum.FALSE.toString
-        Right(Success(result))
-      }
-    }
-  }
-
-  private def getSecret(id: String): Option[(String, String)] = {
-    val selectPstmt = Statements.tlStmts.get.selectPstmt
-    selectPstmt.setInt(1, config.captchaExpiryTimeLimit)
-    selectPstmt.setString(2, id)
-    val rs: ResultSet = selectPstmt.executeQuery()
-    if (rs.first()) {
-      val secret = rs.getString("secret")
-      val provider = rs.getString("provider")
-      Some(provider, secret)
-    } else {
-      None
-    }
-  }
-
-  private def deleteCaptcha(id: String): Unit = {
-    val deleteAnswerPstmt = Statements.tlStmts.get.deleteAnswerPstmt
-    deleteAnswerPstmt.setString(1, id)
-    deleteAnswerPstmt.executeUpdate()
-  }
-
-  def display(): Unit = {
-    val rs: ResultSet = Statements.tlStmts.get.getChallengeTable.executeQuery()
-    println("token\t\tid\t\tsecret\t\tattempted")
-    while (rs.next()) {
-      val token = rs.getInt("token")
-      val id = rs.getString("id")
-      val secret = rs.getString("secret")
-      val attempted = rs.getString("attempted")
-      println(s"${token}\t\t${id}\t\t${secret}\t\t${attempted}\n\n")
-    }
-
-    val rss: ResultSet = Statements.tlStmts.get.getMapIdTable.executeQuery()
-    println("uuid\t\ttoken\t\tlastServed")
-    while (rss.next()) {
-      val uuid = rss.getString("uuid")
-      val token = rss.getInt("token")
-      val lastServed = rss.getTimestamp("lastServed")
-      println(s"${uuid}\t\t${token}\t\t${lastServed}\n\n")
-    }
-  }
-}
--- a/src/main/scala/lc/core/captchaProviders.scala
+++ b/src/main/scala/lc/core/captchaProviders.scala
@ -1,29 +1,35 @@
 package lc.core

-import lc.captchas.*
+import lc.captchas._
 import lc.captchas.interfaces.ChallengeProvider
 import lc.captchas.interfaces.Challenge
 import scala.collection.mutable.Map
-import lc.misc.HelperFunctions

-class CaptchaProviders(config: Config) {
+object CaptchaProviders {
  private val providers = Map(
    "FilterChallenge" -> new FilterChallenge,
-    // "FontFunCaptcha" -> new FontFunCaptcha,
-    "PoppingCharactersCaptcha" -> new PoppingCharactersCaptcha,
+    //"FontFunCaptcha" -> new FontFunCaptcha,
+    "GifCaptcha" -> new GifCaptcha,
    "ShadowTextCaptcha" -> new ShadowTextCaptcha,
-    "RainDropsCaptcha" -> new RainDropsCP,
-    "DebugCaptcha" -> new DebugCaptcha
-    // "LabelCaptcha" -> new LabelCaptcha
+    "RainDropsCaptcha" -> new RainDropsCP
+    //"LabelCaptcha" -> new LabelCaptcha
  )

  def generateChallengeSamples(): Map[String, Challenge] = {
-    providers.map { case (key, provider) =>
-      (key, provider.returnChallenge("easy", "350x100"))
+    providers.map {
+      case (key, provider) =>
+        (key, provider.returnChallenge())
    }
  }

-  private val captchaConfig = config.captchaConfig
+  private val seed = Config.seed
+  private val random = new scala.util.Random(seed)
+  private val config = Config.captchaConfig
+
+  private def getNextRandomInt(max: Int): Int =
+    random.synchronized {
+      random.nextInt(max)
+    }

  def getProviderById(id: String): ChallengeProvider = {
    return providers(id)
@ -31,11 +37,10 @@ class CaptchaProviders(config: Config) {

  private def filterProviderByParam(param: Parameters): Iterable[(String, String)] = {
    val configFilter = for {
-      configValue <- captchaConfig
+      configValue <- config
      if configValue.allowedLevels.contains(param.level)
      if configValue.allowedMedia.contains(param.media)
      if configValue.allowedInputType.contains(param.input_type)
-      if configValue.allowedSizes.contains(param.size)
    } yield (configValue.name, configValue.config)

    val providerFilter = for {
@ -49,16 +54,12 @@ class CaptchaProviders(config: Config) {
    providerFilter
  }

-  def getProvider(param: Parameters): Option[ChallengeProvider] = {
+  def getProvider(param: Parameters): ChallengeProvider = {
    val providerConfig = filterProviderByParam(param).toList
-    if (providerConfig.nonEmpty) {
-      val randomIndex = HelperFunctions.randomNumber(providerConfig.length)
-      val providerIndex = providerConfig(randomIndex)._1
-      val selectedProvider = providers(providerIndex)
-      selectedProvider.configure(providerConfig(randomIndex)._2)
-      Some(selectedProvider)
-    } else {
-      None
-    }
+    val randomIndex = getNextRandomInt(providerConfig.length)
+    val providerIndex = providerConfig(randomIndex)._1
+    val selectedProvider = providers(providerIndex)
+    selectedProvider.configure(providerConfig(randomIndex)._2)
+    selectedProvider
  }
 }
--- a/src/main/scala/lc/core/config.scala
+++ b/src/main/scala/lc/core/config.scala
@ -4,17 +4,13 @@ import scala.io.Source.fromFile
 import org.json4s.{DefaultFormats, JValue, JObject, JField, JString}
 import org.json4s.jackson.JsonMethods.{parse, render, pretty}
 import org.json4s.JsonDSL._
-import org.json4s.StringInput
-import org.json4s.jvalue2monadic
-import org.json4s.jvalue2extractable
 import java.io.{FileNotFoundException, File, PrintWriter}
-import java.{util => ju}
-import lc.misc.HelperFunctions

-class Config(configFilePath: String) {
+object Config {

-  import Config.formats
+  implicit val formats: DefaultFormats.type = DefaultFormats

+  private val configFilePath = "data/config.json"
  private val configString =
    try {
      val configFile = fromFile(configFilePath)
@ -22,99 +18,86 @@ class Config(configFilePath: String) {
      configFile.close
      configFileContent
    } catch {
-      case _: FileNotFoundException => {
+      case _: FileNotFoundException =>
        val configFileContent = getDefaultConfig()
-        val file = if (new File(configFilePath).isDirectory) {
-          new File(configFilePath.concat("/config.json"))
-        } else {
-          new File(configFilePath)
-        }
-        val configFile = new PrintWriter(file)
+        val configFile = new PrintWriter(new File(configFilePath))
        configFile.write(configFileContent)
        configFile.close
        configFileContent
-      }
-      case exception: Exception => {
-        println(exception.getStackTrace)
-        throw new Exception(exception.getMessage)
-      }
    }

  private val configJson = parse(configString)
-  private val configFields: ConfigField = configJson.extract[ConfigField]

-  val port: Int = configFields.portInt.getOrElse(8888)
-  val address: String = configFields.address.getOrElse("0.0.0.0")
-  val bufferCount: Int = configFields.bufferCountInt.getOrElse(1000)
-  val seed: Int = configFields.seedInt.getOrElse(375264328)
-  val captchaExpiryTimeLimit: Int = configFields.captchaExpiryTimeLimitInt.getOrElse(5)
-  val threadDelay: Int = configFields.threadDelayInt.getOrElse(2)
-  val playgroundEnabled: Boolean = configFields.playgroundEnabledBool.getOrElse(true)
-  val corsHeader: String = configFields.corsHeader.getOrElse("")
-  val maxAttempts: Int = Math.max(1, (configFields.maxAttemptsRatioFloat.getOrElse(0.01f) * bufferCount).toInt)
+  val port: Int = (configJson \ AttributesEnum.PORT.toString).extract[Int]
+  val throttle: Int = (configJson \ AttributesEnum.THROTTLE.toString).extract[Int]
+  val seed: Int = (configJson \ AttributesEnum.RANDOM_SEED.toString).extract[Int]
+  val captchaExpiryTimeLimit: Int = (configJson \ AttributesEnum.CAPTCHA_EXPIRY_TIME_LIMIT.toString).extract[Int]
+  val threadDelay: Int = (configJson \ AttributesEnum.THREAD_DELAY.toString).extract[Int]

  private val captchaConfigJson = (configJson \ "captchas")
-  val captchaConfigTransform: JValue = captchaConfigJson transformField { case JField("config", JObject(config)) =>
-    ("config", JString(config.toString))
+  val captchaConfigTransform: JValue = captchaConfigJson transformField {
+    case JField("config", JObject(config)) => ("config", JString(config.toString))
  }
  val captchaConfig: List[CaptchaConfig] = captchaConfigTransform.extract[List[CaptchaConfig]]
-  val allowedLevels: Set[String] = captchaConfig.flatMap(_.allowedLevels).toSet
-  val allowedMedia: Set[String] = captchaConfig.flatMap(_.allowedMedia).toSet
-  val allowedInputType: Set[String] = captchaConfig.flatMap(_.allowedInputType).toSet
+  val allowedLevels: Set[String] = getAllValues(configJson, ParametersEnum.ALLOWEDLEVELS.toString)
+  val allowedMedia: Set[String] = getAllValues(configJson, ParametersEnum.ALLOWEDMEDIA.toString)
+  val allowedInputType: Set[String] = getAllValues(configJson, ParametersEnum.ALLOWEDINPUTTYPE.toString)

-  HelperFunctions.setSeed(seed)
+  private def getAllValues(config: JValue, param: String): Set[String] = {
+    val configValues = (config \\ param)
+    val result = for {
+      JObject(child) <- configValues
+      JField(param) <- child
+    } yield (param)
+
+    var valueSet = Set[String]()
+    for (valueList <- result) {
+      for (value <- valueList._2.children) {
+        valueSet += value.values.toString
+      }
+    }
+    valueSet
+  }

  private def getDefaultConfig(): String = {
-    val defaultConfigMap =
-      (AttributesEnum.RANDOM_SEED.toString -> new ju.Random().nextInt()) ~
-        (AttributesEnum.PORT.toString -> 8888) ~
-        (AttributesEnum.ADDRESS.toString -> "0.0.0.0") ~
-        (AttributesEnum.CAPTCHA_EXPIRY_TIME_LIMIT.toString -> 5) ~
-        (AttributesEnum.BUFFER_COUNT.toString -> 1000) ~
-        (AttributesEnum.THREAD_DELAY.toString -> 2) ~
-        (AttributesEnum.PLAYGROUND_ENABLED.toString -> true) ~
-        (AttributesEnum.CORS_HEADER.toString -> "") ~
-        (AttributesEnum.MAX_ATTEMPTS_RATIO.toString -> 0.01f) ~
-        ("captchas" -> List(
-          (
-            (AttributesEnum.NAME.toString -> "FilterChallenge") ~
-              (ParametersEnum.ALLOWEDLEVELS.toString -> List("medium", "hard")) ~
-              (ParametersEnum.ALLOWEDMEDIA.toString -> List("image/png")) ~
-              (ParametersEnum.ALLOWEDINPUTTYPE.toString -> List("text")) ~
-              (ParametersEnum.ALLOWEDSIZES.toString -> List("350x100")) ~
-              (AttributesEnum.CONFIG.toString -> JObject())
-          ),
-          (
-            (AttributesEnum.NAME.toString -> "PoppingCharactersCaptcha") ~
-              (ParametersEnum.ALLOWEDLEVELS.toString -> List("hard")) ~
-              (ParametersEnum.ALLOWEDMEDIA.toString -> List("image/gif")) ~
-              (ParametersEnum.ALLOWEDINPUTTYPE.toString -> List("text")) ~
-              (ParametersEnum.ALLOWEDSIZES.toString -> List("350x100")) ~
-              (AttributesEnum.CONFIG.toString -> JObject())
-          ),
-          (
-            (AttributesEnum.NAME.toString -> "ShadowTextCaptcha") ~
-              (ParametersEnum.ALLOWEDLEVELS.toString -> List("easy")) ~
-              (ParametersEnum.ALLOWEDMEDIA.toString -> List("image/png")) ~
-              (ParametersEnum.ALLOWEDINPUTTYPE.toString -> List("text")) ~
-              (ParametersEnum.ALLOWEDSIZES.toString -> List("350x100")) ~
-              (AttributesEnum.CONFIG.toString -> JObject())
-          ),
-          (
-            (AttributesEnum.NAME.toString -> "RainDropsCaptcha") ~
-              (ParametersEnum.ALLOWEDLEVELS.toString -> List("easy", "medium")) ~
-              (ParametersEnum.ALLOWEDMEDIA.toString -> List("image/gif")) ~
-              (ParametersEnum.ALLOWEDINPUTTYPE.toString -> List("text")) ~
-              (ParametersEnum.ALLOWEDSIZES.toString -> List("350x100")) ~
-              (AttributesEnum.CONFIG.toString -> JObject())
-          )
-        ))
+    val defaultConfigMap = 
+      (AttributesEnum.RANDOM_SEED.toString -> 20) ~
+      (AttributesEnum.PORT.toString -> 8888) ~
+      (AttributesEnum.CAPTCHA_EXPIRY_TIME_LIMIT.toString -> 5) ~
+      (AttributesEnum.THROTTLE.toString -> 10) ~
+      (AttributesEnum.THREAD_DELAY.toString -> 2) ~
+      ("captchas" -> List(
+        (
+          (AttributesEnum.NAME.toString -> "FilterChallenge") ~
+          (ParametersEnum.ALLOWEDLEVELS.toString -> List("medium", "hard")) ~
+          (ParametersEnum.ALLOWEDMEDIA.toString -> List("image/png")) ~
+          (ParametersEnum.ALLOWEDINPUTTYPE.toString -> List("text")) ~
+          (AttributesEnum.CONFIG.toString -> JObject())
+        ),
+        (
+          (AttributesEnum.NAME.toString -> "GifCaptcha") ~
+          (ParametersEnum.ALLOWEDLEVELS.toString -> List("hard")) ~
+          (ParametersEnum.ALLOWEDMEDIA.toString -> List("image/gif")) ~
+          (ParametersEnum.ALLOWEDINPUTTYPE.toString -> List("text")) ~
+          (AttributesEnum.CONFIG.toString -> JObject())
+        ),
+        (
+          (AttributesEnum.NAME.toString -> "ShadowTextCaptcha") ~
+          (ParametersEnum.ALLOWEDLEVELS.toString -> List("easy")) ~
+          (ParametersEnum.ALLOWEDMEDIA.toString -> List("image/png")) ~
+          (ParametersEnum.ALLOWEDINPUTTYPE.toString -> List("text")) ~
+          (AttributesEnum.CONFIG.toString -> JObject())
+        ),
+        (
+          (AttributesEnum.NAME.toString -> "RainDropsCaptcha") ~
+          (ParametersEnum.ALLOWEDLEVELS.toString -> List("easy", "medium")) ~
+          (ParametersEnum.ALLOWEDMEDIA.toString -> List("image/gif")) ~
+          (ParametersEnum.ALLOWEDINPUTTYPE.toString -> List("text")) ~
+          (AttributesEnum.CONFIG.toString -> JObject())
+        )
+      ))

    pretty(render(defaultConfigMap))
  }

 }
-
-object Config {
-  implicit val formats: DefaultFormats.type = DefaultFormats
-}
--- a/src/main/scala/lc/core/models.scala
+++ b/src/main/scala/lc/core/models.scala
@ -1,47 +1,16 @@
 package lc.core

-import org.json4s.jackson.Serialization.write
-import lc.core.Config.formats
-
-trait ByteConvert { def toBytes(): Array[Byte] }
+sealed trait ChallengeResult
 case class Size(height: Int, width: Int)
-case class Parameters(level: String, media: String, input_type: String, size: String)
-case class Id(id: String) extends ByteConvert { def toBytes(): Array[Byte] = { write(this).getBytes } }
-case class Image(image: Array[Byte]) extends ByteConvert { def toBytes(): Array[Byte] = { image } }
+case class Parameters(level: String, media: String, input_type: String, size: Option[Size])
+case class Id(id: String) extends ChallengeResult
+case class Error(message: String) extends ChallengeResult
 case class Answer(answer: String, id: String)
-case class Success(result: String) extends ByteConvert { def toBytes(): Array[Byte] = { write(this).getBytes } }
-case class Error(message: String) extends ByteConvert { def toBytes(): Array[Byte] = { write(this).getBytes } }
+case class Result(result: String)
 case class CaptchaConfig(
    name: String,
    allowedLevels: List[String],
    allowedMedia: List[String],
    allowedInputType: List[String],
-    allowedSizes: List[String],
    config: String
 )
-case class ConfigField(
-    port: Option[Integer],
-    address: Option[String],
-    bufferCount: Option[Integer],
-    seed: Option[Integer],
-    captchaExpiryTimeLimit: Option[Integer],
-    threadDelay: Option[Integer],
-    playgroundEnabled: Option[java.lang.Boolean],
-    corsHeader: Option[String],
-    maxAttemptsRatio: Option[java.lang.Float]
-) {
-  lazy val portInt: Option[Int] = mapInt(port)
-  lazy val bufferCountInt: Option[Int] = mapInt(bufferCount)
-  lazy val seedInt: Option[Int] = mapInt(seed)
-  lazy val captchaExpiryTimeLimitInt: Option[Int] = mapInt(captchaExpiryTimeLimit)
-  lazy val threadDelayInt: Option[Int] = mapInt(threadDelay)
-  lazy val maxAttemptsRatioFloat: Option[Float] = mapFloat(maxAttemptsRatio)
-  lazy val playgroundEnabledBool: Option[Boolean] = playgroundEnabled.map(_ || false)
-
-  private def mapInt(x: Option[Integer]): Option[Int] = {
-    x.map(_ + 0)
-  }
-  private def mapFloat(x: Option[java.lang.Float]): Option[Float] = {
-    x.map(_ + 0.0f)
-  }
-}
--- a/src/main/scala/lc/database/DB.scala
+++ b/src/main/scala/lc/database/DB.scala
@ -1,10 +1,9 @@
 package lc.database

-import java.sql.{Connection, DriverManager, Statement}
+import java.sql._

 class DBConn() {
-  val con: Connection =
-    DriverManager.getConnection("jdbc:h2:./data/H2/captcha3;MAX_COMPACT_TIME=8000;DB_CLOSE_ON_EXIT=FALSE", "sa", "")
+  val con: Connection = DriverManager.getConnection("jdbc:h2:./data/H2/captcha", "sa", "")

  def getStatement(): Statement = {
    con.createStatement()
--- a/src/main/scala/lc/database/statements.scala
+++ b/src/main/scala/lc/database/statements.scala
@ -4,7 +4,7 @@ import lc.database.DBConn
 import java.sql.Statement
 import java.sql.PreparedStatement

-class Statements(dbConn: DBConn, maxAttempts: Int) {
+class Statements(dbConn: DBConn) {

  private val stmt = dbConn.getStatement()

@ -17,13 +17,9 @@ class Statements(dbConn: DBConn, maxAttempts: Int) {
      "contentType varchar, " +
      "contentLevel varchar, " +
      "contentInput varchar, " +
-      "size varchar, " +
      "image blob, " +
      "attempted int default 0, " +
-      "PRIMARY KEY(token));" +
-      """
-      CREATE INDEX IF NOT EXISTS attempted ON challenge(attempted);
-      """
+      "PRIMARY KEY(token))"
  )
  stmt.execute(
    "CREATE TABLE IF NOT EXISTS mapId" +
@ -38,8 +34,8 @@ class Statements(dbConn: DBConn, maxAttempts: Int) {

  val insertPstmt: PreparedStatement = dbConn.con.prepareStatement(
    "INSERT INTO " +
-      "challenge(id, secret, provider, contentType, contentLevel, contentInput, size, image) " +
-      "VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
+      "challenge(id, secret, provider, contentType, contentLevel, contentInput, image) " +
+      "VALUES (?, ?, ?, ?, ?, ?, ?)",
    Statement.RETURN_GENERATED_KEYS
  )

@ -68,33 +64,20 @@ class Statements(dbConn: DBConn, maxAttempts: Int) {
  val updateAttemptedPstmt: PreparedStatement = dbConn.con.prepareStatement(
    "UPDATE challenge " +
      "SET attempted = attempted+1 " +
-      "WHERE token = ?;"
-  )
-
-  val countForParameterPstmt: PreparedStatement = dbConn.con.prepareStatement(
-    s"""
-      SELECT count(*) as count
-        FROM challenge
-        WHERE attempted < $maxAttempts AND
-        contentLevel = ? AND
-        contentType = ? AND
-        contentInput = ? AND
-        size = ?
-        """
+      "WHERE token = (SELECT m.token " +
+      "FROM mapId m, challenge c " +
+      "WHERE m.token=c.token AND " +
+      "m.uuid = ?)"
  )

  val tokenPstmt: PreparedStatement = dbConn.con.prepareStatement(
-    s"""
-      SELECT token, attempted
-        FROM challenge
-        WHERE attempted < $maxAttempts AND
-        contentLevel = ? AND
-        contentType = ? AND
-        contentInput = ? AND
-        size = ?
-        LIMIT 1
-        OFFSET FLOOR(RAND()*?)
-         """
+    "SELECT token " +
+      "FROM challenge " +
+      "WHERE attempted < 10 AND " +
+      "contentLevel = ? AND " +
+      "contentType = ? AND " +
+      "contentInput = ? " +
+      "ORDER BY RAND() LIMIT 1"
  )

  val deleteAnswerPstmt: PreparedStatement = dbConn.con.prepareStatement(
@ -102,9 +85,9 @@ class Statements(dbConn: DBConn, maxAttempts: Int) {
  )

  val challengeGCPstmt: PreparedStatement = dbConn.con.prepareStatement(
-    s"""DELETE FROM challenge
-      WHERE attempted >= $maxAttempts AND
-      token NOT IN (SELECT token FROM mapId)"""
+    "DELETE FROM challenge " +
+      "WHERE attempted >= 10 AND " +
+      "token NOT IN (SELECT token FROM mapId)"
  )

  val mapIdGCPstmt: PreparedStatement = dbConn.con.prepareStatement(
@ -123,25 +106,9 @@ class Statements(dbConn: DBConn, maxAttempts: Int) {
    "SELECT * FROM mapId"
  )

-  val shutdown: PreparedStatement = dbConn.con.prepareStatement(
-    "SHUTDOWN"
-  )
-
-  val shutdownCompact: PreparedStatement = dbConn.con.prepareStatement(
-    "SHUTDOWN COMPACT"
-  )
-
 }

 object Statements {
-  /* Note: h2 documentation recommends using a separate DB connection per thread
-     But in practice, as of version 1.4.200, multiple connections occassionally shows error on the console of the form
-     ```
-     org.h2.jdbc.JdbcSQLNonTransientException: General error: "java.lang.NullPointerException"; SQL statement:
-     SELECT image FROM challenge c, mapId m WHERE c.token=m.token AND m.uuid = ? [50000-200]
-     ```
-   */
  private val dbConn: DBConn = new DBConn()
-  var maxAttempts: Int = 10
-  val tlStmts: ThreadLocal[Statements] = ThreadLocal.withInitial(() => new Statements(dbConn, maxAttempts))
+  val tlStmts: ThreadLocal[Statements] = ThreadLocal.withInitial(() => new Statements(dbConn))
 }
--- a/src/main/scala/lc/server/Server.scala
+++ b/src/main/scala/lc/server/Server.scala
@ -1,108 +1,62 @@
 package lc.server

+import org.json4s.DefaultFormats
 import org.json4s.jackson.JsonMethods.parse
-import org.json4s.jvalue2extractable
-import lc.core.CaptchaManager
-import lc.core.ErrorMessageEnum
-import lc.core.{Answer, ByteConvert, Error, Id, Parameters}
-import lc.core.Config.formats
-import org.limium.picoserve
-import org.limium.picoserve.Server.{ByteResponse, ServerBuilder, StringResponse}
-import scala.io.Source
-import java.net.InetSocketAddress
-import java.util
-import scala.jdk.CollectionConverters._
+import org.json4s.jackson.Serialization.write
+import lc.core.Captcha
+import lc.core.{Parameters, Id, Answer}
+import lc.server.HTTPServer

-class Server(
-    address: String,
-    port: Int,
-    captchaManager: CaptchaManager,
-    playgroundEnabled: Boolean,
-    corsHeader: String
-) {
-  var headerMap: util.Map[String, util.List[String]] = _
-  if (corsHeader.nonEmpty) {
-    headerMap = Map("Access-Control-Allow-Origin" -> List(corsHeader).asJava).asJava
-  }
-  val serverBuilder: ServerBuilder = picoserve.Server
-    .builder()
-    .address(new InetSocketAddress(address, port))
-    .backlog(32)
-    .POST(
-      "/v2/captcha",
-      (request) => {
-        val json = parse(request.getBodyString())
-        val param = json.extract[Parameters]
-        val id = captchaManager.getChallenge(param)
-        getResponse(id, headerMap)
-      }
-    )
-    .GET(
-      "/v2/media",
-      (request) => {
-        val params = request.getQueryParams()
-        val result = if (params.containsKey("id")) {
-          val paramId = params.get("id").get(0)
-          val id = Id(paramId)
-          captchaManager.getCaptcha(id)
-        } else {
-          Left(Error(ErrorMessageEnum.INVALID_PARAM.toString + "=> id"))
-        }
-        getResponse(result, headerMap)
-      }
-    )
-    .POST(
-      "/v2/answer",
-      (request) => {
-        val json = parse(request.getBodyString())
-        val answer = json.extract[Answer]
-        val result = captchaManager.checkAnswer(answer)
-        getResponse(result, headerMap)
-      }
-    )
-  if (playgroundEnabled) {
-    serverBuilder.GET(
-      "/demo/index.html",
-      (_) => {
-        val resStream = getClass().getResourceAsStream("/index.html")
-        val str = Source.fromInputStream(resStream).mkString
-        new StringResponse(200, str)
-      }
-    )
-    serverBuilder.GET(
-      "/",
-      (_) => {
-        val str = """
-        <html>
-          <h2>Welcome to LibreCaptcha server</h2>
-          <h3><a href="/demo/index.html">Link to Demo</a></h3>
-          <h3>API is served at <b>/v2/</b></h3>
-        </html>
-        """
-        new StringResponse(200, str)
-      }
-    )
-    println("Playground enabled on /demo/index.html")
-  }
+class Server(port: Int, captcha: Captcha) {
+  val server = new HTTPServer(port)
+  val host: HTTPServer.VirtualHost = server.getVirtualHost(null)

-  val server: picoserve.Server = serverBuilder.build()
+  implicit val formats: DefaultFormats.type = DefaultFormats

-  private def getResponse(
-      response: Either[Error, ByteConvert],
-      responseHeaders: util.Map[String, util.List[String]]
-  ): ByteResponse = {
-    response match {
-      case Right(value) => {
-        new ByteResponse(200, value.toBytes(), responseHeaders)
-      }
-      case Left(value) => {
-        new ByteResponse(500, value.toBytes(), responseHeaders)
-      }
-    }
-  }
+  host.addContext(
+    "/v1/captcha",
+    (req, resp) => {
+      val body = req.getJson()
+      val json = parse(body)
+      val param = json.extract[Parameters]
+      val id = captcha.getChallenge(param)
+      resp.getHeaders().add("Content-Type", "application/json")
+      resp.send(200, write(id))
+      0
+    },
+    "POST"
+  )
+
+  host.addContext(
+    "/v1/media",
+    (req, resp) => {
+      val params = req.getParams()
+      val id = Id(params.get("id"))
+      val image = captcha.getCaptcha(id)
+      resp.getHeaders().add("Content-Type", "image/png")
+      resp.send(200, image)
+      0
+    },
+    "GET"
+  )
+
+  host.addContext(
+    "/v1/answer",
+    (req, resp) => {
+      val body = req.getJson()
+      val json = parse(body)
+      val answer = json.extract[Answer]
+      val result = captcha.checkAnswer(answer)
+      resp.getHeaders().add("Content-Type", "application/json")
+      resp.send(200, write(result))
+      0
+    },
+    "POST"
+  )

  def start(): Unit = {
-    println("Starting server on " + address + ":" + port)
+    println("Starting server on port:" + port)
    server.start()
  }
+
 }
--- a/tests/debug-config.json
+++ b/tests/debug-config.json
@ -1,19 +0,0 @@
-{
-  "randomSeed" : 20,
-  "port" : 8888,
-  "address" : "0.0.0.0",
-  "captchaExpiryTimeLimit" : 5,
-  "bufferCount" : 10,
-  "threadDelay" : 2,
-  "playgroundEnabled" : false,
-  "corsHeader" : "*",
-  "maxAttemptsRatio" : 0.01,
-  "captchas" : [ {
-    "name" : "DebugCaptcha",
-    "allowedLevels" : [ "debug" ],
-    "allowedMedia" : [ "image/png" ],
-    "allowedInputType" : [ "text" ],
-    "allowedSizes" : [ "350x100" ],
-    "config" : { }
-  }]
-}
--- a/tests/locustfile-functional.py
+++ b/tests/locustfile-functional.py
@ -1,65 +0,0 @@
-from locust import task, between, SequentialTaskSet
-from locust.contrib.fasthttp import FastHttpUser
-from locust import events
-import json
-import logging
-import subprocess
-
-@events.quitting.add_listener
-def _(environment, **kw):
-    totalStats = environment.stats.total
-    if totalStats.fail_ratio > 0.20:
-        logging.error("Test failed due to failure ratio " + totalStats.fail_ratio + " > 20%")
-        environment.process_exit_code = 1
-    elif totalStats.get_response_time_percentile(0.80) > 800:
-        logging.error("Test failed due to 80th percentile response time > 800 ms")
-        environment.process_exit_code = 1
-    else:
-        environment.process_exit_code = 0
-
-class QuickStartUser(SequentialTaskSet):
-    wait_time = between(0.1,0.2)
-
-    @task
-    def captcha(self):
-        captcha_params = {"level":"debug","media":"image/png","input_type":"text", "size":"350x100"}
-
-        with self.client.post(path="/v2/captcha", json=captcha_params, name="/captcha", catch_response = True) as resp:
-          if resp.status_code != 200:
-            resp.failure("Status was not 200: " + resp.text)
-          captchaJson = resp.json()
-          uuid = captchaJson.get("id")
-          if not uuid:
-            resp.failure("uuid not returned on /captcha endpoint: " + resp.text)
-
-        with self.client.get(path="/v2/media?id=%s" % uuid, name="/media", stream=True, catch_response = True) as resp:
-          if resp.status_code != 200:
-            resp.failure("Status was not 200: " + resp.text)
-
-          media = resp.content
-
-        ocrAnswer = self.solve(uuid, media)
-
-        answerBody = {"answer": ocrAnswer,"id": uuid}
-        with self.client.post(path='/v2/answer', json=answerBody, name="/answer", catch_response=True) as resp:
-          if resp.status_code != 200:
-              resp.failure("Status was not 200: " + resp.text)
-          else:
-            if resp.json().get("result") != "True":
-              resp.failure("Answer was not accepted: " + ocrAnswer)
-
-    def solve(self, uuid, media):
-       mediaFileName = "tests/test-%s.png" % uuid
-       with open(mediaFileName, "wb") as f:
-           f.write(media)
-       #ocrResult = subprocess.Popen("gocr %s" % mediaFileName, shell=True, stdout=subprocess.PIPE)
-       ocrResult = subprocess.Popen("tesseract %s stdout -l eng" % mediaFileName, shell=True, stdout=subprocess.PIPE)
-       ocrAnswer = ocrResult.stdout.readlines()[0].strip().decode()
-       return ocrAnswer
-
-
-
-class User(FastHttpUser):
-    wait_time = between(0.1,0.2)
-    tasks = [QuickStartUser]
-    host = "http://localhost:8888"
--- a/tests/locustfile.py
+++ b/tests/locustfile.py
@ -1,32 +1,16 @@
 from locust import task, between, SequentialTaskSet
 from locust.contrib.fasthttp import FastHttpUser
-from locust import events
 import json
-import logging
-
-@events.quitting.add_listener
-def _(environment, **kw):
-    if environment.stats.total.fail_ratio > 0.02:
-        logging.error("Test failed due to failure ratio > 2%")
-        environment.process_exit_code = 1
-    elif environment.stats.total.avg_response_time > 300:
-        logging.error("Test failed due to average response time ratio > 300 ms")
-        environment.process_exit_code = 1
-    elif environment.stats.total.get_response_time_percentile(0.95) > 800:
-        logging.error("Test failed due to 95th percentile response time > 800 ms")
-        environment.process_exit_code = 1
-    else:
-        environment.process_exit_code = 0

 class QuickStartUser(SequentialTaskSet):
-    wait_time = between(0.1,0.2)
+    wait_time = between(0.1,1)

    @task
    def captcha(self):
        # TODO: Iterate over parameters for a more comprehensive test
-        captcha_params = {"level":"easy","media":"image/png","input_type":"text", "size":"350x100"}
+        captcha_params = {"level":"easy","media":"image/png","input_type":"text"}

-        resp = self.client.post(path="/v2/captcha", json=captcha_params, name="/captcha")
+        resp = self.client.post(path="/v1/captcha", json=captcha_params, name="/captcha")
        if resp.status_code != 200:
            print("\nError on /captcha endpoint: ")
            print(resp)
@ -36,14 +20,14 @@ class QuickStartUser(SequentialTaskSet):
        uuid = json.loads(resp.text).get("id")
        answerBody = {"answer": "qwer123","id": uuid}

-        resp = self.client.get(path="/v2/media?id=%s" % uuid, name="/media")
+        resp = self.client.get(path="/v1/media?id=%s" % uuid, name="/media")
        if resp.status_code != 200:
            print("\nError on /media endpoint: ")
            print(resp)
            print(resp.text)
            print("----------------END.MEDIA-------------------\n\n")

-        resp = self.client.post(path='/v2/answer', json=answerBody, name="/answer")
+        resp = self.client.post(path='/v1/answer', json=answerBody, name="/answer")
        if resp.status_code != 200:
            print("\nError on /answer endpoint: ")
            print(resp)
@ -52,6 +36,6 @@ class QuickStartUser(SequentialTaskSet):


 class User(FastHttpUser):
-    wait_time = between(0.1,0.2)
+    wait_time = between(0.1,1)
    tasks = [QuickStartUser]
    host = "http://localhost:8888"
--- a/tests/run.sh
+++ b/tests/run.sh
@ -1,34 +0,0 @@
-set -ex
-
-python3 -m venv testEnv
-source ./testEnv/bin/activate
-pip install locust
-mkdir -p data/
-java -jar target/scala-3.6.2/LibreCaptcha.jar &
-JAVA_PID=$!
-sleep 4
-
-locust --only-summary --headless -u 300 -r 100 --run-time 4m --stop-timeout 30 -f tests/locustfile.py
-status=$?
-
-if [ $status != 0 ]; then
-  exit $status
-fi
-
-kill $JAVA_PID
-sleep 4
-
-echo Run functional test
-cp data/config.json data/config.json.bak
-cp tests/debug-config.json data/config.json
-
-java -jar target/scala-3.6.2/LibreCaptcha.jar &
-JAVA_PID=$!
-sleep 4
-
-locust --only-summary --headless -u 1 -r 1 --run-time 1m --stop-timeout 30 -f tests/locustfile-functional.py
-status=$?
-mv data/config.json.bak data/config.json
-
-kill $JAVA_PID
-exit $status