diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
index 59538abc..d1709639 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
@@ -408,7 +408,7 @@ class Calculator {
 				results.addStat(MINIMUM_NETRESULT, min)
 			}
 			maxDuration?.let { maxd ->
-				results.addStat(MAXIMUM_DURATION, maxd)
+				results.addStat(MAXIMUM_DURATION, maxd / 3600000)  // (milliseconds to hours)
 			}
 
 			val bbPer100Hands = bbSum / totalHands * 100
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarDetailsFragment.kt
index 15f72051..f83d712f 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarDetailsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarDetailsFragment.kt
@@ -102,11 +102,11 @@ class CalendarDetailsFragment : PokerAnalyticsFragment(), StaticRowRepresentable
 			rowRepresentables.add(StatDoubleRow(computedResults.computedStat(Stat.LOCATIONS_PLAYED), computedResults.computedStat(Stat.LONGEST_STREAKS)))
 			rowRepresentables.add(CustomizableRowRepresentable(RowViewType.HEADER_TITLE, resId = R.string.distribution))
 			rowRepresentables.add(GraphRow(Stat.NETRESULT, null, ""))
-			rowRepresentables.add(StatDoubleRow(computedResults.computedStat(Stat.WIN_RATIO)))
+			rowRepresentables.add(StatDoubleRow(computedResults.computedStat(Stat.WIN_RATIO), computedResults.computedStat(Stat.MAXIMUM_NETRESULT)))
 			rowRepresentables.add(CustomizableRowRepresentable(RowViewType.HEADER_TITLE, resId = R.string.volume))
 			rowRepresentables.add(GraphRow(Stat.NETRESULT, null, ""))
 			rowRepresentables.add(StatDoubleRow(computedResults.computedStat(Stat.DURATION), computedResults.computedStat(Stat.AVERAGE_DURATION)))
-			rowRepresentables.add(StatDoubleRow(computedResults.computedStat(Stat.DAYS_PLAYED)))
+			rowRepresentables.add(StatDoubleRow(computedResults.computedStat(Stat.DAYS_PLAYED), computedResults.computedStat(Stat.MAXIMUM_DURATION)))
 
 			//computedResults.group.conditions
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt
index 07174f6a..07fcb870 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt
@@ -238,8 +238,11 @@ class CalendarFragment : SessionObserverFragment(), CoroutineScope, StaticRowRep
 				else -> listOf(Comparator.YEAR, Comparator.MONTH_OF_YEAR).combined()
 			}
 
+			val requiredStats: List<Stat> = listOf(Stat.LOCATIONS_PLAYED, Stat.LONGEST_STREAKS, Stat.DAYS_PLAYED)
+			val options = Calculator.Options(evolutionValues = Calculator.Options.EvolutionValues.STANDARD, stats = requiredStats)
 			monthConditions.forEach { conditions ->
-				val report = Calculator.computeStatsWithComparators(realm, conditions = conditions, options = Calculator.Options())
+
+				val report = Calculator.computeStatsWithComparators(realm, conditions = conditions, options = options)
 				report.results.forEach { computedResults ->
 					if (!computedResults.isEmpty) {
 						// Set date data
@@ -267,7 +270,7 @@ class CalendarFragment : SessionObserverFragment(), CoroutineScope, StaticRowRep
 			}
 
 			yearConditions.forEach { conditions ->
-				val report = Calculator.computeStatsWithComparators(realm, conditions = conditions, options = Calculator.Options())
+				val report = Calculator.computeStatsWithComparators(realm, conditions = conditions, options = options)
 				report.results.forEach { computedResults ->
 					if (!computedResults.isEmpty) {
 						// Set date data