diff --git a/API/db/app.db b/API/db/app.db
index 6dc4be37842cf08e9cb52092e424c45275a8d8d7..594906caf3268accd4b81baac28e62079b28baf2 100644
Binary files a/API/db/app.db and b/API/db/app.db differ
diff --git a/API/src/database/Database.ts b/API/src/database/Database.ts
index 4766c5b5eef5e03fc90afd89f76b71ea7c8461c2..79485ddcbdb69eb3fcdd49b8fd3ad62546650281 100644
--- a/API/src/database/Database.ts
+++ b/API/src/database/Database.ts
@@ -113,7 +113,7 @@ class DBHandler {
         
         await asyncdb.all(insert_question);
         
-        const id_json = await asyncdb.get(get_id)
+        const id_json = await asyncdb.get(get_id);
         
         const id_obj = id_json as Question_t;
         const insert_correct = "INSERT INTO answer (text_answer, id_question, correct) \
@@ -132,9 +132,19 @@ class DBHandler {
     }
 
     async getQuestions(req:express.Request, res:express.Response) {
-        asyncdb.all("SELECT * FROM questions")
-        .then( result => res.status(StatusCodes.OK).json(result).end())
-        .catch(e => console.log(e))
+        const query = "SELECT * FROM questions";
+        const query_answers = "SELECT * FROM answer";
+        
+
+        let questions = await asyncdb.all(query);
+        let ans = await asyncdb.all(query_answers);
+        
+        let payload = {
+            QUESTIONS: questions,
+            ANSWERS: ans
+        }
+
+        res.status(StatusCodes.OK).json(payload)
     }
 
     async updateQuestion(req:express.Request, res:express.Response){