diff --git a/src/main/java/com/ntlab/irisserver/entities/Room.java b/src/main/java/com/ntlab/irisserver/entities/Room.java
index b3d0983..2e891d7 100644
--- a/src/main/java/com/ntlab/irisserver/entities/Room.java
+++ b/src/main/java/com/ntlab/irisserver/entities/Room.java
@@ -17,43 +17,22 @@
         public String ownerName;
         //String ownerName = null;
 
-        @JsonProperty("drawingTimer")
-        public boolean drawingTimer;
-        //boolean drawingTimer;
 
-        @JsonProperty("drawingTimerTimes")
-        public int drawingTimerTimes;
-        //int drawingTimerTimes;
-
-        @JsonProperty("gameTimer")
-        public boolean gameTimer;
-        //boolean gameTimer;
-
-        @JsonProperty("gameTimerTimes")
-        public int gameTimerTimes;
-        //int gameTimerTimes;
-
-        @JsonProperty("gameTimerFirstThinkingTimes")
-        public int gameTimerFirstThinkingTimes;
-        //int gameTimerFirstThinkingTimes;
-
-        @JsonProperty("redMaster")
         private Member redMaster;
-        @JsonProperty("blueMaster")
         private Member blueMaster;
         Map<String,Member> members= new HashMap<>();
         Map<Integer, Drawing> drawings = new HashMap<>();
 
+        Settings settings = new Settings();
 
 
         public Room(String rid, String owner) {
                 this.rid=rid;
                 ownerName=owner;
-                drawingTimer = false;
-                drawingTimerTimes = 0;
-                gameTimer = true;
-                gameTimerTimes = 30;
-                gameTimerFirstThinkingTimes = 10;
+        }
+
+        public Settings getSettings() {
+                return settings;
         }
 
         public List<Member> getMembers() {
@@ -164,46 +143,4 @@
                 drawings.put(dno, d);
         }
 
-        public void setDrawingTimer(boolean drawingTimer) {
-                this.drawingTimer = drawingTimer;
-        }
-
-        public void setDrawingTimerTimes(int drawingTimerTimes) {
-                this.drawingTimerTimes = drawingTimerTimes;
-        }
-
-        public void setGameTimer(boolean gameTimer) {
-                this.gameTimer = gameTimer;
-        }
-
-        public void setGameTimerTimes(int gameTimerTimes) {
-                this.gameTimerTimes = gameTimerTimes;
-        }
-
-        public void setGameTimerFirstThinkingTimes(int gameTimerFirstThinkingTimes) {
-                this.gameTimerFirstThinkingTimes = gameTimerFirstThinkingTimes;
-        }
-
-        public boolean isDrawingTimer() {
-                return drawingTimer;
-        }
-
-        public int getDrawingTimerTimes() {
-                return drawingTimerTimes;
-        }
-
-        public boolean isGameTimer() {
-                return gameTimer;
-        }
-
-        public int getGameTimerTimes() {
-                return gameTimerTimes;
-        }
-
-        public int getGameTimerFirstThinkingTimes() {
-                return gameTimerFirstThinkingTimes;
-        }
-
-
-
 }