diff --git a/src/main/java/org/ntlab/amaryllis/server/models/Voicememos.java b/src/main/java/org/ntlab/amaryllis/server/models/Voicememos.java
index c714c53..cda9373 100644
--- a/src/main/java/org/ntlab/amaryllis/server/models/Voicememos.java
+++ b/src/main/java/org/ntlab/amaryllis/server/models/Voicememos.java
@@ -3,12 +3,14 @@
 import org.ntlab.amaryllis.server.entities.Voicememo;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.UUID;
 
 
 public class Voicememos {
     private static Voicememos theInstance = null;
-    private static ArrayList<Voicememo> voicememos = new ArrayList<>();
+    private static HashMap<String,Voicememo> voiceMap = new HashMap<>();
 
     private Voicememos() {
     }
@@ -26,16 +28,11 @@
     }
 
     public Voicememo getVoicememo(String vid) {
-        for (Voicememo a : voicememos) {
-            if (a.getVid().equals(vid)) {
-                return a;
-            }
-        }
-        return null;
+        return voiceMap.get(vid);
     }
 
-    public ArrayList<Voicememo> getVoicememos() {
-        return voicememos;
+    public Collection<Voicememo> getVoicememos() {
+        return voiceMap.values();
     }
 
 
@@ -45,14 +42,13 @@
         }
 
         Voicememo newVoicememo = new Voicememo(vid, uid, time, url, latitude, longitude, title, summary);
-        voicememos.add(newVoicememo);
+        voiceMap.put(vid,newVoicememo);
         return newVoicememo;
 
     }
 
     public void removeVoicememo(String vid) {
-        Voicememo removeVoicememo = getVoicememo(vid);
-        voicememos.remove(removeVoicememo);
+        voiceMap.remove(vid);
     }