diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java
index c006fa3..77aea2e 100644
--- a/src/main/java/cactusServer/entities/Account.java
+++ b/src/main/java/cactusServer/entities/Account.java
@@ -1,22 +1,13 @@
 package cactusServer.entities;
 
 public class Account {
-	private String id,name,pass;
+	private String name,pass;
 
-	public Account(String userId, String userName,String userPass) {
-		setId(userId);
+	public Account(String userName,String userPass) {
 		setName(userName);
 		setPass(userPass);
 	}
 
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
 	public String getName() {
 		return name;
 	}
diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java
index f505d40..2c999a3 100644
--- a/src/main/java/cactusServer/models/Accounts.java
+++ b/src/main/java/cactusServer/models/Accounts.java
@@ -4,17 +4,15 @@
 
 import cactusServer.entities.Account;
 
-import java.util.ArrayList;
+import java.util.HashMap;
 
 @Singleton
 public class Accounts {
 	private static Accounts theInstance = null;
-	private static ArrayList<Account> accounts = new ArrayList<Account>();
+	private HashMap<String,Account> accounts = new HashMap<>();
 
 	public Accounts() {
-		if (theInstance == null) {
-			theInstance = this;
-		}
+		
 	}
 
 	public static Accounts getInstance() {
@@ -24,39 +22,26 @@
 		return theInstance;
 	}
 
-	public static Account createAcount(String userID,String userName,String userPass) {
+	public Account createAcount(String userID,String userName,String userPass) {
 		System.out.println(userName);
 
-		Account newAccount = new Account(userID, userName,userPass);
-		accounts.add(newAccount);
+		Account newAccount = new Account(userName,userPass);
+		accounts.put(userID, newAccount);
 
 		System.out.println(userID);
 
 		return newAccount;
 	}
 
-	public static ArrayList<Account> getAccountList() {
-		return accounts;
-	}
-
-	public static Account getAccount(String userID) {
-		Account editAccount = null;
-		for(int i=0;i<accounts.size();i++) {
-			if(accounts.get(i).getId() == userID) {
-				editAccount = accounts.get(i);
-				break;
-			}
-		}
+	public Account getAccount(String userID) {
+		Account editAccount = accounts.get(userID);
 		return editAccount;
 	}
 	
-	public String deleteAccount(int userID) {
+	public String deleteAccount(String userID) {
 		accounts.remove(userID);
 		return "complated remove account";
 	}
 
-	public ArrayList<Account> getAccounts() {
-		return accounts;
-	}
 
 }
diff --git a/src/main/java/cactusServer/resources/AccountsRest.java b/src/main/java/cactusServer/resources/AccountsRest.java
index af0be8f..181513e 100644
--- a/src/main/java/cactusServer/resources/AccountsRest.java
+++ b/src/main/java/cactusServer/resources/AccountsRest.java
@@ -27,14 +27,14 @@
 	@Produces(MediaType.APPLICATION_JSON)
 	public Account create(@QueryParam("userID") String userID, @QueryParam("userName") String userName,
 			@QueryParam("userPass") String userPass) {
-		Accounts.createAcount(userID, userName, userPass);
-		return Accounts.getAccount(userID);
+		Accounts.getInstance().createAcount(userID, userName, userPass);
+		return Accounts.getInstance().getAccount(userID);
 	}
 
 	@GET
 	@Path("/getAccount")
 	@Produces(MediaType.APPLICATION_JSON)
 	public Account getAccount(@QueryParam("userID") String userID) {
-		return Accounts.getAccount(userID);
+		return Accounts.getInstance().getAccount(userID);
 	}
 }