diff --git a/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java
index cd8727d..ccf7ad7 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java
@@ -53,9 +53,7 @@
     private static final String TAG = MainActivity.class.getSimpleName();
     LocationManager locationManager;
     private ArrayList<LocationListener> listeners = new ArrayList<>();
-    private HashMap<String ,Category> categories;
-    private ArrayList<String> checkedList = new ArrayList<>();
-    HashMap<Integer,String> menuItemMap = new HashMap<>();
+    static HashMap<String ,Category> categories;
     ImageButton playbutton;
     ImageButton stopbutton;
     ImageButton skipbutton;
@@ -239,41 +237,46 @@
         return categories.get(cid);
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.nav_drawer_menu, menu);
-
-        //カテゴリーの数だけitemを定義
-        int id=0;
-        for(Category category : categories.values()){
-            String name = category.getName();
-            String cid = category.getcId();
-            MenuItem newItem = menu.add(Menu.NONE, id, Menu.NONE, name);
-            menuItemMap.put(newItem.getItemId(),cid);
-            newItem.setCheckable(true);
-            newItem.setChecked(true);
-            checkedList.add(cid);
-            id++;
-        }
-        return true;
+    public static HashMap<String,Category> getCategories(){
+        return categories;
     }
 
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        String cid = menuItemMap.get(item.getItemId());
-
-        item.setChecked(!item.isChecked());
-        if(item.isChecked()){
-            checkedList.add(cid);
-        }else{
-            checkedList.remove(cid);
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    public ArrayList getCheckedCidList() {
-        return checkedList;
-    }
+//
+//    @Override
+//    public boolean onCreateOptionsMenu(Menu menu) {
+//        getMenuInflater().inflate(R.menu.nav_drawer_menu, menu);
+//
+//        //カテゴリーの数だけitemを定義
+//        int id=0;
+//        for(Category category : categories.values()){
+//            String name = category.getName();
+//            String cid = category.getcId();
+//            MenuItem newItem = menu.add(Menu.NONE, id, Menu.NONE, name);
+//            menuItemMap.put(newItem.getItemId(),cid);
+//            newItem.setCheckable(true);
+//            newItem.setChecked(true);
+//            checkedList.add(cid);
+//            id++;
+//        }
+//        return true;
+//    }
+//
+//
+//    @Override
+//    public boolean onOptionsItemSelected(MenuItem item) {
+//        String cid = menuItemMap.get(item.getItemId());
+//
+//        item.setChecked(!item.isChecked());
+//        if(item.isChecked()){
+//            checkedList.add(cid);
+//        }else{
+//            checkedList.remove(cid);
+//        }
+//        return super.onOptionsItemSelected(item);
+//    }
+//
+//    public ArrayList getCheckedCidList() {
+//        return checkedList;
+//    }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/PlayListManager.java b/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/PlayListManager.java
index 95957b0..ec09458 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/PlayListManager.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/PlayListManager.java
@@ -5,6 +5,7 @@
 public class PlayListManager{
     int index = 0;
     ArrayList<VoiceMemo> playlist = new ArrayList<>();
+    ArrayList<VoiceMemo> unplayedlist = new ArrayList<>();
     //範囲内にある全てのvoicememoのリストを作成
     public void addVoiceMemos(ArrayList<VoiceMemo> voicememos){
         for(int i = 0;i < voicememos.size(); i++) {
@@ -25,25 +26,32 @@
 
     //次に聞くvoicememoを渡す
     public ArrayList<VoiceMemo> getUnplayedList(){
-        ArrayList<VoiceMemo> unplayedlist = new ArrayList<>();
-        if (index != 0){
-            index++;
+
+//        next();
+//        unplayedlist.clear();
+//        unplayedlist.add(playlist.get(index));
+
+        for(int i = 0;i < unplayedlist.size(); i++) {
+            boolean exist = false;
+            for(int j= index;j < playlist.size(); j++){
+                if(playlist.get(j).getVid().equals(unplayedlist.get(i).getVid()))
+                    exist = true;
+            }
+            if(exist = false)
+                playlist.add(unplayedlist.get(i));
         }
-        unplayedlist.add(playlist.get(index));
-//        for(int i = 0;i < unplayedlist.size(); i++) {
-//            boolean exist = false;
-//            for(int j= index;j < playlist.size(); j++){
-//                if(playlist.get(j).getVid().equals(unplayedlist.get(i).getVid()))
-//                    exist = true;
-//            }
-//            if(exist = false)
-//                playlist.add(unplayedlist.get(i));
-//        }
-//        for(int i = index; i < playlist.size(); i++){
-//            unplayedlist.add(playlist.get(i));
-//        }
+        for(int i = index; i < playlist.size(); i++){
+            unplayedlist.add(playlist.get(i));
+        }
         return unplayedlist;
     }
+   
+    public VoiceMemo getNextVoicememo(){
+        VoiceMemo result=getUnplayedList().remove(0);
+        next();
+        return result;
+
+    }
 
     //次のvoicememoに移動する
     public void next() {