diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dc21aea..17e02ce 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,13 +26,7 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:screenOrientation="landscape" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
+            android:screenOrientation="landscape" />
         <activity
             android:name=".EnterRoomActivity"
             android:exported="true"
@@ -56,7 +50,13 @@
         <activity
             android:name=".TestEnterActivity"
             android:exported="true"
-            android:screenOrientation="landscape" />
+            android:screenOrientation="landscape" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".TestDrawingActivity"
             android:exported="true"
diff --git a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
index 251ae14..1f83b34 100644
--- a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
@@ -2,6 +2,7 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentTransaction;
+import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 
@@ -27,6 +28,10 @@
     private String currentTeam = "r";
     private int turnState = 0;//0:ヒント入力,1:カード選択
 
+    //ヒントの情報
+    private String hint = "aaa";
+    private Integer hintMax = 1;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -71,25 +76,18 @@
         //タイマースタート呼び出し
         gameViewModel.start(500,iris);
 
-        //hintを監視
+        //ヒントの変更を監視
         gameViewModel.getHintLiveData().observe(this, new Observer<String>() {
             @Override
-            public void onChanged(String hint) {
-
-                //画面に反映
-                EditText Hint = findViewById(R.id.GameHint);
-                Hint.setText(hint);
+            public void onChanged(String new_Hint) {
+                hint = new_Hint;
             }
         });
 
-        //hintMaxを監視
         gameViewModel.getmaxLiveData().observe(this, new Observer<Integer>() {
             @Override
-            public void onChanged(Integer hintMax) {
-
-                //画面に反映
-                EditText HintMax = findViewById(R.id.GameHintMax);
-                HintMax.setText(hintMax);
+            public void onChanged(Integer new_HintMax) {
+                hintMax = new_HintMax;
             }
         });
 
@@ -106,7 +104,7 @@
             }
         });
 
-     /*   //「ヒント入力」か「カード選択」かを監視
+        //「ヒント入力」か「カード選択」かを監視
         gameViewModel.getTurnStateLiveData().observe(this, new Observer<Integer>() {
             @Override
             public void onChanged(Integer new_turnState) {
@@ -114,10 +112,16 @@
                 //チームの情報を更新
                 turnState = new_turnState;
 
+                //ヒントの情報を反映
+                EditText Hint = findViewById(R.id.GameHint);
+                EditText HintMax = findViewById(R.id.GameHintMax);
+                Hint.setText(hint);
+                HintMax.setText(hintMax.toString());
+
                 //操作できるかを判断する。
                 isActive = CheckActivity();
             }
-        });*/
+        });