diff --git a/src/dev/peerat/backend/routes/admins/puzzle/GetPuzzle.java b/src/dev/peerat/backend/routes/admins/puzzle/GetPuzzle.java
index be975d4..060e9ba 100644
--- a/src/dev/peerat/backend/routes/admins/puzzle/GetPuzzle.java
+++ b/src/dev/peerat/backend/routes/admins/puzzle/GetPuzzle.java
@@ -25,7 +25,7 @@ public class GetPuzzle implements Response{
 		JsonMap json = new JsonMap();
 		json.set("name", puzzle.getName());
 		json.set("content", puzzle.getContent());
-		json.set("soluce", puzzle.getSoluce());
+		json.set("soluce", new String(puzzle.getSoluce()));
 		json.set("score_max", puzzle.getScoreMax());
 		
 		context.response(200);
diff --git a/src/dev/peerat/backend/routes/admins/puzzle/GetPuzzles.java b/src/dev/peerat/backend/routes/admins/puzzle/GetPuzzles.java
index e3d1059..0014688 100644
--- a/src/dev/peerat/backend/routes/admins/puzzle/GetPuzzles.java
+++ b/src/dev/peerat/backend/routes/admins/puzzle/GetPuzzles.java
@@ -1,13 +1,17 @@
 package dev.peerat.backend.routes.admins.puzzle;
 
+import java.util.List;
 import java.util.regex.Matcher;
 
+import dev.peerat.backend.model.Puzzle;
 import dev.peerat.backend.repository.DatabaseRepository;
 import dev.peerat.framework.Context;
 import dev.peerat.framework.HttpReader;
 import dev.peerat.framework.HttpWriter;
 import dev.peerat.framework.Response;
 import dev.peerat.framework.Route;
+import dev.peerat.framework.utils.json.JsonArray;
+import dev.peerat.framework.utils.json.JsonMap;
 
 public class GetPuzzles implements Response{
 	
@@ -19,6 +23,19 @@ public class GetPuzzles implements Response{
 	
 	@Route(path = "^/admin/puzzles/$", needLogin = true)
 	public void exec(Matcher matcher, Context context, HttpReader reader, HttpWriter writer) throws Exception{
+		List<Puzzle> puzzles = repo.getAdminPuzzles();
+		JsonArray array = new JsonArray();
+		for (Puzzle puzzle : puzzles){
+			JsonMap puzzleJSON = new JsonMap();
+			puzzleJSON.set("id", puzzle.getId());
+			puzzleJSON.set("name", puzzle.getName());
+			puzzleJSON.set("scoreMax", puzzle.getScoreMax());
+			if(puzzle.getTags() != null) puzzleJSON.set("tags", puzzle.getJsonTags());
+			puzzleJSON.set("show", puzzle.hasStarted());
+			array.add(puzzleJSON);
+		}
+		context.response(200);
+		writer.write(array.toString());
 	}
 
 }