diff --git a/app/src/main/kotlin/jackall/moncalc/db/QuestRecordRealmHelper.kt b/app/src/main/kotlin/jackall/moncalc/db/QuestRecordRealmHelper.kt
index a19eab0..2a206a8 100644
--- a/app/src/main/kotlin/jackall/moncalc/db/QuestRecordRealmHelper.kt
+++ b/app/src/main/kotlin/jackall/moncalc/db/QuestRecordRealmHelper.kt
@@ -84,6 +84,16 @@
         return realm.where(QuestRecord::class.java).greaterThan("createAt", yesterday.time).findAll().count()
     }
 
+    fun getTodayExtraCount(): Int {
+        val yesterday = Calendar.getInstance().apply { add(Calendar.DATE, -1) }
+        return realm.where(QuestRecord::class.java).greaterThan("createAt", yesterday.time).equalTo("extra", true).findAll().count()
+    }
+
+    fun getTodayWakurinCount(): Int {
+        val yesterday = Calendar.getInstance().apply { add(Calendar.DATE, -1) }
+        return realm.where(QuestRecord::class.java).greaterThan("createAt", yesterday.time).sum("wakurin").toInt()
+    }
+
     fun getTodaySpecialCount(): Int {
         val yesterday = Calendar.getInstance().apply { add(Calendar.DATE, -1) }
         val results = realm.where(QuestRecord::class.java).greaterThan("createAt", yesterday.time).greaterThan("drops.gradeId", 2).findAll()
@@ -107,6 +117,16 @@
         return realm.where(QuestRecord::class.java).greaterThan("createAt", weekAgo.time).findAll().count()
     }
 
+    fun getWeekExtraCount(): Int {
+        val yesterday = Calendar.getInstance().apply { add(Calendar.DATE, -7) }
+        return realm.where(QuestRecord::class.java).greaterThan("createAt", yesterday.time).equalTo("extra", true).findAll().count()
+    }
+
+    fun getWeekWakurinCount(): Int {
+        val yesterday = Calendar.getInstance().apply { add(Calendar.DATE, -7) }
+        return realm.where(QuestRecord::class.java).greaterThan("createAt", yesterday.time).sum("wakurin").toInt()
+    }
+
     fun getWeekSpecialCount(): Int {
         val weekAgo = Calendar.getInstance().apply { add(Calendar.DATE, -7) }
         val results = realm.where(QuestRecord::class.java).greaterThan("createAt", weekAgo.time).greaterThan("drops.gradeId", 2).findAll()
diff --git a/app/src/main/kotlin/jackall/moncalc/viewmodel/HistoryViewModel.kt b/app/src/main/kotlin/jackall/moncalc/viewmodel/HistoryViewModel.kt
index ee5f246..e73be88 100644
--- a/app/src/main/kotlin/jackall/moncalc/viewmodel/HistoryViewModel.kt
+++ b/app/src/main/kotlin/jackall/moncalc/viewmodel/HistoryViewModel.kt
@@ -15,10 +15,14 @@
 class HistoryViewModel() : LifecycleViewModel() {
 
     val todayTempleCount = ObservableField<String>()
+    val todayExtraCount = ObservableField<String>()
+    val todayWakurinCount = ObservableField<String>()
     val todayDrop = ObservableField<String>()
     val todaySpecialDrop = ObservableField<String>()
     val todaySpecialPercent = ObservableField<String>()
     val weekTempleCount = ObservableField<String>()
+    val weekExtraCount = ObservableField<String>()
+    val weekWakurinCount = ObservableField<String>()
     val weekDrop = ObservableField<String>()
     val weekSpecialDrop = ObservableField<String>()
     val weekSpecialPercent = ObservableField<String>()
@@ -58,6 +62,8 @@
     fun setHistoryData() {
         val questRealmHelper = QuestRecordRealmHelper()
         todayTempleCount.set(questRealmHelper.getTodayCount().toString())
+        todayExtraCount.set(questRealmHelper.getTodayExtraCount().toString())
+        todayWakurinCount.set(questRealmHelper.getTodayWakurinCount().toString())
         todayDrop.set(questRealmHelper.getTodayDropCount().toString())
         todaySpecialDrop.set(questRealmHelper.getTodaySpecialCount().toString())
         val todaySpecialPercent = (questRealmHelper.getTodaySpecialCount().toFloat() / questRealmHelper.getTodayCount().toFloat()) * 100
@@ -67,6 +73,8 @@
             this.todaySpecialPercent.set("${String.format("%.1f", todaySpecialPercent)}%")
         }
         weekTempleCount.set(questRealmHelper.getWeekCount().toString())
+        weekExtraCount.set(questRealmHelper.getWeekExtraCount().toString())
+        weekWakurinCount.set(questRealmHelper.getWeekWakurinCount().toString())
         weekDrop.set(questRealmHelper.getWeekDropCount().toString())
         weekSpecialDrop.set(questRealmHelper.getWeekSpecialCount().toString())
         val weekSpecialPercent = (questRealmHelper.getWeekSpecialCount().toFloat() / questRealmHelper.getWeekCount().toFloat()) * 100
diff --git a/app/src/main/res/layout/fragment_analyze_fruit.xml b/app/src/main/res/layout/fragment_analyze_fruit.xml
index c487805..e40e838 100644
--- a/app/src/main/res/layout/fragment_analyze_fruit.xml
+++ b/app/src/main/res/layout/fragment_analyze_fruit.xml
@@ -47,7 +47,7 @@
                     android:layout_weight="1"
                     android:background="#000000"
                     android:gravity="center"
-                    android:text="特急L"
+                    android:text="特級L"
                     android:textColor="#ffffff" />
 
                 <TextView
@@ -57,7 +57,7 @@
                     android:layout_weight="1"
                     android:background="#000000"
                     android:gravity="center"
-                    android:text="特急M"
+                    android:text="特級M"
                     android:textColor="#ffffff" />
 
                 <TextView
@@ -67,7 +67,7 @@
                     android:layout_weight="1"
                     android:background="#000000"
                     android:gravity="center"
-                    android:text="特急"
+                    android:text="特級"
                     android:textColor="#ffffff" />
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_analyze_temple.xml b/app/src/main/res/layout/fragment_analyze_temple.xml
index 62b5bf3..9e80ab8 100644
--- a/app/src/main/res/layout/fragment_analyze_temple.xml
+++ b/app/src/main/res/layout/fragment_analyze_temple.xml
@@ -85,7 +85,7 @@
                                 android:layout_height="match_parent"
                                 android:layout_weight="1"
                                 android:gravity="center"
-                                android:text="特急率"
+                                android:text="特級率"
                                 android:textColor="#ffffff" />
 
                             <TextView
diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml
index 70336df..ca6b26d 100644
--- a/app/src/main/res/layout/fragment_history.xml
+++ b/app/src/main/res/layout/fragment_history.xml
@@ -34,6 +34,7 @@
                     android:layout_height="match_parent">
 
                     <TextView
+                        android:id="@+id/history_last_24"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -43,29 +44,83 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-                    <TextView
-                        android:id="@+id/today_count_temple_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginStart="8dp"
-                        android:text="神殿の周回数"
-                        android:textSize="@dimen/history_card_title_size"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/today_count_temple_value" />
 
-                    <TextView
-                        android:id="@+id/today_count_temple_value"
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:id="@+id/history_last_24_top"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="24dp"
-                        android:text="@{historyViewModel.todayTempleCount}"
-                        android:textColor="@color/main_background"
-                        android:textSize="@dimen/hisotry_card_value_size"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        app:layout_constraintTop_toBottomOf="@id/history_last_24">
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@{historyViewModel.todayTempleCount}"
+                                android:textColor="@color/main_background"
+                                android:textSize="@dimen/hisotry_card_value_size" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="神殿の周回数"
+                                android:textSize="@dimen/history_card_title_size" />
+
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@{historyViewModel.todayExtraCount}"
+                                android:textColor="@color/main_background"
+                                android:textSize="@dimen/hisotry_card_value_size" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="エクストラ出現"
+                                android:textSize="@dimen/history_card_title_size" />
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@{historyViewModel.todayWakurinCount}"
+                                android:textColor="@color/main_background"
+                                android:textSize="@dimen/hisotry_card_value_size" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="わくりん出現"
+                                android:textSize="@dimen/history_card_title_size" />
+
+                        </LinearLayout>
+
+                    </LinearLayout>
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -76,7 +131,7 @@
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/today_count_temple_title">
+                        app:layout_constraintTop_toBottomOf="@+id/history_last_24_top">
 
                         <LinearLayout
                             android:layout_width="0dp"
@@ -120,7 +175,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:gravity="center"
-                                android:text="特急のドロップ数"
+                                android:text="特級のドロップ数"
                                 android:textSize="@dimen/history_card_title_size" />
 
 
@@ -143,7 +198,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="特急のドロップ率"
+                                android:text="特級のドロップ率"
                                 android:textSize="@dimen/history_card_title_size" />
 
 
@@ -170,6 +225,7 @@
                     android:layout_height="match_parent">
 
                     <TextView
+                        android:id="@+id/history_last_week"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -179,29 +235,82 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-                    <TextView
-                        android:id="@+id/week_count_temple_title"
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:id="@+id/history_last_week_top"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginStart="8dp"
-                        android:text="神殿の周回数"
-                        android:textSize="@dimen/history_card_title_size"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/week_count_temple_value" />
+                        app:layout_constraintTop_toBottomOf="@id/history_last_week">
 
-                    <TextView
-                        android:id="@+id/week_count_temple_value"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="24dp"
-                        android:text="@{historyViewModel.weekTempleCount}"
-                        android:textColor="@color/main_background"
-                        android:textSize="@dimen/hisotry_card_value_size"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@{historyViewModel.weekTempleCount}"
+                                android:textColor="@color/main_background"
+                                android:textSize="@dimen/hisotry_card_value_size" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="神殿の周回数"
+                                android:textSize="@dimen/history_card_title_size" />
+
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@{historyViewModel.weekExtraCount}"
+                                android:textColor="@color/main_background"
+                                android:textSize="@dimen/hisotry_card_value_size" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="エクストラ出現"
+                                android:textSize="@dimen/history_card_title_size" />
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@{historyViewModel.weekWakurinCount}"
+                                android:textColor="@color/main_background"
+                                android:textSize="@dimen/hisotry_card_value_size" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="わくりん出現"
+                                android:textSize="@dimen/history_card_title_size" />
+
+                        </LinearLayout>
+
+                    </LinearLayout>
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -212,7 +321,7 @@
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/week_count_temple_title">
+                        app:layout_constraintTop_toBottomOf="@+id/history_last_week_top">
 
                         <LinearLayout
                             android:layout_width="0dp"
@@ -256,7 +365,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:gravity="center"
-                                android:text="特急のドロップ数"
+                                android:text="特級のドロップ数"
                                 android:textSize="@dimen/history_card_title_size" />
 
 
@@ -279,7 +388,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="特急のドロップ率"
+                                android:text="特級のドロップ率"
                                 android:textSize="@dimen/history_card_title_size" />