diff --git a/PeerAtCodeParser.jar b/PeerAtCodeParser.jar
index 95d9a7f..06d84d1 100644
Binary files a/PeerAtCodeParser.jar and b/PeerAtCodeParser.jar differ
diff --git a/src/dev/peerat/framework/Router.java b/src/dev/peerat/framework/Router.java
index 3dbb153..d967ce0 100644
--- a/src/dev/peerat/framework/Router.java
+++ b/src/dev/peerat/framework/Router.java
@@ -7,8 +7,6 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.net.ServerSocket;
 import java.net.Socket;
-import java.util.ArrayList;
-import java.util.List;
 
 import javax.net.ssl.SSLServerSocket;
 import javax.net.ssl.SSLServerSocketFactory;
diff --git a/src/dev/peerat/framework/utils/json/JsonParser.java b/src/dev/peerat/framework/utils/json/JsonParser.java
index db6722c..5590fa4 100644
--- a/src/dev/peerat/framework/utils/json/JsonParser.java
+++ b/src/dev/peerat/framework/utils/json/JsonParser.java
@@ -1,17 +1,17 @@
 package dev.peerat.framework.utils.json;
 
-import static be.jeffcheasey88.peeratcode.parser.TokenType.*;
+import static dev.peerat.parser.TokenType.*;
 
-import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import be.jeffcheasey88.peeratcode.parser.Parser;
-import be.jeffcheasey88.peeratcode.parser.Token;
-import be.jeffcheasey88.peeratcode.parser.state.RedirectStateTree;
-import be.jeffcheasey88.peeratcode.parser.state.StateTree;
+import dev.peerat.parser.Parser;
+import dev.peerat.parser.Token;
+import dev.peerat.parser.state.RedirectStateTree;
+import dev.peerat.parser.state.StateTree;
 
 public class JsonParser extends Parser<Json>{
 	
@@ -26,7 +26,7 @@ public class JsonParser extends Parser<Json>{
 		StateTree<Json> content_array_element = content_array.then(new RedirectStateTree<>(content, (global, local) ->{
 			List<Object> list = global.get();
 			if(list == null){
-				list = new ArrayList<>();
+				list = new LinkedList<>();
 				global.set(list);
 			}
 			list.add(local.get());
diff --git a/src/dev/peerat/framework/utils/json/JsonTokenizer.java b/src/dev/peerat/framework/utils/json/JsonTokenizer.java
index ad212f8..a0d0952 100644
--- a/src/dev/peerat/framework/utils/json/JsonTokenizer.java
+++ b/src/dev/peerat/framework/utils/json/JsonTokenizer.java
@@ -1,13 +1,14 @@
 package dev.peerat.framework.utils.json;
 
-import be.jeffcheasey88.peeratcode.parser.Token;
-import be.jeffcheasey88.peeratcode.parser.TokenType;
-import be.jeffcheasey88.peeratcode.parser.Tokenizer;
+import dev.peerat.parser.Token;
+import dev.peerat.parser.TokenType;
+import dev.peerat.parser.Tokenizer;
 
 public class JsonTokenizer extends Tokenizer{
 	
 	@Override
 	public void parse(String line){
+		long time = System.currentTimeMillis();
 		for(int i = 0; i < line.length(); i++){
 			char c = line.charAt(i);
 			
@@ -56,6 +57,7 @@ public class JsonTokenizer extends Tokenizer{
 				getTokens().add(new Token(1, i+1, ""+c, TokenType.DELIMITER));
 			}
 		}
+		System.out.println("tokenizer -> "+(System.currentTimeMillis()-time)+"ms"); time = System.currentTimeMillis();
 	}
 	
 	private boolean isValidName(char c){