diff --git a/api.py b/api.py
index 484dc574a..38c51aa14 100644
--- a/api.py
+++ b/api.py
@@ -208,7 +208,7 @@ async def drop_db(payload: Payload):
             else:
                 pass
 
-            from cognitive_architecture.database.create_database import drop_database, create_admin_engine
+            from cognitive_architecture.database.create_database_tst import drop_database, create_admin_engine
 
             engine = create_admin_engine(username, password, host, database_name)
             drop_database(engine)
diff --git a/cognitive_architecture/database/create_database_tst.py b/cognitive_architecture/database/create_database_tst.py
new file mode 100644
index 000000000..46339dd16
--- /dev/null
+++ b/cognitive_architecture/database/create_database_tst.py
@@ -0,0 +1,110 @@
+# this is needed to import classes from other modules
+# script_dir = os.path.dirname(os.path.abspath(__file__))
+# # Get the parent directory of your script and add it to sys.path
+# parent_dir = os.path.dirname(script_dir)
+# sys.path.append(parent_dir)
+from cognitive_architecture.database.postgres.models import memory
+from cognitive_architecture.database.postgres.models import metadatas
+from cognitive_architecture.database.postgres.models import operation
+from cognitive_architecture.database.postgres.models import sessions
+from cognitive_architecture.database.postgres.models import user
+from cognitive_architecture.database.postgres.models import docs
+# from cognitive_architecture.config import Config
+# config = Config()
+# config.load()
+
+
+
+from postgres.database import Base
+
+from sqlalchemy import create_engine, text
+import psycopg2
+from dotenv import load_dotenv
+load_dotenv()
+import os
+
+
+import os
+
+
+if os.environ.get('AWS_ENV') == 'prd' or os.environ.get('AWS_ENV') == 'dev':
+    host = os.environ.get('POSTGRES_HOST')
+    username = os.environ.get('POSTGRES_USER')
+    password = os.environ.get('POSTGRES_PASSWORD')
+    database_name = os.environ.get('POSTGRES_DB')
+elif os.environ.get('AWS_ENV') == 'local':
+    host = os.environ.get('POSTGRES_HOST')
+    username = os.environ.get('POSTGRES_USER')
+    password = os.environ.get('POSTGRES_PASSWORD')
+    database_name = os.environ.get('POSTGRES_DB')
+else:
+    host = os.environ.get('POSTGRES_HOST')
+    username = os.environ.get('POSTGRES_USER')
+    password = os.environ.get('POSTGRES_PASSWORD')
+    database_name = os.environ.get('POSTGRES_DB')
+
+
+
+def create_admin_engine(username, password, host, database_name):
+    admin_url = f"postgresql://{username}:{password}@{host}:5432/{database_name}"
+    return create_engine(admin_url)
+
+
+def database_exists(username, password, host, db_name):
+    engine = create_admin_engine(username, password, host, db_name)
+    connection = engine.connect()
+    query = text(f"SELECT 1 FROM pg_database WHERE datname='{db_name}'")
+    result = connection.execute(query).fetchone()
+    connection.close()
+    engine.dispose()
+    return result is not None
+
+
+def create_database(username, password, host, db_name):
+    engine = create_admin_engine(username, password, host, db_name)
+    connection = engine.raw_connection()
+    connection.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)
+    cursor = connection.cursor()
+    cursor.execute(f"CREATE DATABASE {db_name}")
+    cursor.close()
+    connection.close()
+    engine.dispose()
+
+
+def drop_database(username, password, host, db_name):
+    engine = create_admin_engine(username, password, host)
+    connection = engine.raw_connection()
+    connection.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)
+    cursor = connection.cursor()
+    cursor.execute(f"DROP DATABASE IF EXISTS {db_name}")
+    cursor.close()
+    connection.close()
+    engine.dispose()
+    print(f"Database {db_name} dropped successfully.")
+
+
+
+def create_tables(engine):
+    Base.metadata.create_all(bind=engine)
+
+if __name__ == "__main__":
+    #
+    # username = os.getenv('POSTGRES_USER')
+    # password = os.getenv('POSTGRES_PASSWORD')
+    # database_name = os.getenv('POSTGRES_DB')
+    # environment = os.environ.get("ENV")
+    # host  = config.postgres_host
+    # username = config.postgres_user
+    # password = config.postgres_password
+    # database_name = config.postgres_db
+
+    engine = create_admin_engine(username, password, host, database_name)
+
+    print(Base.metadata.tables)
+
+    if not database_exists(username, password, host, database_name):
+        print(f"Database {database_name} does not exist. Creating...")
+        create_database(username, password, host, database_name)
+        print(f"Database {database_name} created successfully.")
+
+    create_tables(engine)
\ No newline at end of file