diff --git a/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java b/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java
index 29e3d7b..ee6874d 100644
--- a/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java
+++ b/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java
@@ -8,10 +8,13 @@
     private boolean master;
 
 
-    public MemberJson(String nickname) {
-        this.nickname = nickname;
-        this.belongs = "n";
-        this.master = false;
+//    public MemberJson(String nickname) {
+//        this.nickname = nickname;
+//        this.belongs = "n";
+//        this.master = false;
+//    }
+
+    public MemberJson() {
     }
 
     //-------------------------------------
diff --git a/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java b/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java
index bb6bfb7..959eb9e 100644
--- a/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java
+++ b/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java
@@ -3,99 +3,30 @@
 import android.provider.Settings;
 import org.ntlab.irisclient.models.Member;
 import org.ntlab.irisclient.models.Room;
+
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 public class RoomJson {
 
     //フィールド
-    public String rid;
+    private String rid;
     private int state;
-    public String ownerName;
-    Map<String,Member> members= new HashMap<>();
-    Settings settings = new Settings();
-    //Game game = null;
-    private Member redMaster;
-    private Member blueMaster;
+    private String ownerName;
+    List<Member> members = new ArrayList<>();
 
     //--------------------------------------------------------------
-    public RoomJson(String rid, String owner) {
-        this.rid = rid;
-        ownerName = owner;
+    public RoomJson(){
     }
 
     //--------------------------------------------------------------
     //getter
-    public String getRid(){
-        return rid;
-    }
+    public String getRid() {return this.rid;}
 
-    public String getOwnerName() {
-        return ownerName;
-    }
+    public int getState() {return this.state;}
 
-    public Settings getSettings() {
-        return settings;
-    }
+    public String getOwnerName() {return this.ownerName;}
 
-    public List<Member> getMembers() {
-        List<Member> memberslist = new ArrayList<Member>(members.values()) ;
-        return memberslist;
-    }
-
-
-    public Member getRedMaster() {
-        return redMaster;
-    }
-
-    public Member getBlueMaster() {
-        return blueMaster;
-    }
-
-
-    public Member getMember(String nick) {
-        Member m = members.get(nick);
-        return m;
-    }
-
-    public void deleteMember(String nick) {
-        members.remove(nick);
-    }
-
-    public int getState() {
-        return state;
-    }
-
-
-
-    //--------------------------------------------------------------
-    //setter
-    public void setOwnerName(String ownerName) {
-        this.ownerName = ownerName;
-    }
-
-    public Member setMember(String nick) {
-        Member m = members.get(nick);
-        return m;
-    }
-
-    public void setRedMaster(Member redMaster) {
-        this.redMaster = redMaster;
-    }
-
-    public void setBlueMaster(Member blueMaster) {
-        this.blueMaster = blueMaster;
-    }
-
-    public Settings setSettings() {
-        return settings;
-    }
-
-
-
-    //--------------------------------------------------------------
-
+    public List<Member> getMembers() {return this.members;}
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/irisclient/models/Member.java b/app/src/main/java/org/ntlab/irisclient/models/Member.java
index 00cd2a1..e6250f6 100644
--- a/app/src/main/java/org/ntlab/irisclient/models/Member.java
+++ b/app/src/main/java/org/ntlab/irisclient/models/Member.java
@@ -3,7 +3,7 @@
 public class Member {
 
     private String nickname;
-    // belongs) r:赤チーム　b：青チーム　n:無所属
+    //r:赤チーム　b：青チーム　n:無所属
     private String belongs;
     private boolean master;
 
@@ -29,6 +29,6 @@
 
     public String getBelongs() {return this.belongs;}
 
-    public boolean isMaster() {return this.master;}
+    public boolean getMaster() {return this.master;}
 
 }
diff --git a/app/src/main/java/org/ntlab/irisclient/models/Room.java b/app/src/main/java/org/ntlab/irisclient/models/Room.java
index ccd7b4a..74ab603 100644
--- a/app/src/main/java/org/ntlab/irisclient/models/Room.java
+++ b/app/src/main/java/org/ntlab/irisclient/models/Room.java
@@ -1,5 +1,5 @@
 package org.ntlab.irisclient.models;
-
+import org.ntlab.irisclient.entities.RoomJson;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -10,6 +10,7 @@
 
     //フィールド
     private String rid;
+    private int state;
     private String ownerName;
     private Member redMaster;
     private Member blueMaster;
@@ -17,10 +18,10 @@
     private Settings settings = new Settings();
 
     //--------------------------------------------------------------
-    /* public Room(String rid, String owner) {
+    public Room(String rid, String owner) {
         this.rid = rid;
         ownerName = owner;
-    }*/
+    }
 
     //--------------------------------------------------------------
     //getter
@@ -54,6 +55,10 @@
         return settings;
     }
 
+    public int getState() {
+        return state;
+    }
+
     //--------------------------------------------------------------
     //setter
     public void setOwnerName(String ownerName) {
@@ -77,6 +82,14 @@
         return settings;
     }
 
+    public void changeState(){
+        state += 1;
+    }
+
+    public void resetState(){
+        state = 0;
+    }
+
     //--------------------------------------------------------------
 
 }