diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 0d55728394..0e0cbe5da2 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -8,6 +8,10 @@ ________________________________________________________________________________
 StepMania 5.0 $next | 2011????
 --------------------------------------------------------------------------------
 
+2011/09/23
+----------
+* [ScreenEvaluation] Added RollingNumbersMaxComboClass metric. [AJ]
+
 2011/09/22
 ----------
 * [ScreenDebugOverlay] Replaced hardcoded toggle command with
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index c4f289c381..c4632c8e81 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -1085,6 +1085,9 @@ TextFormat="%04.0f"
 ApproachSeconds=1
 Commify=false
 
+[RollingNumbersMaxCombo]
+Fallback="RollingNumbersJudgment"
+
 [ScoreDisplayNormal]
 FrameX=
 FrameY=
@@ -3232,6 +3235,7 @@ MaxComboNumDigits=4
 #
 ShowBannerArea=true
 RollingNumbersClass="RollingNumbersJudgment"
+RollingNumbersMaxComboClass="RollingNumbersMaxCombo"
 #
 ShowSharedJudgmentLineLabels=false
 ShowJudgmentLineW1=false
diff --git a/src/ScreenEvaluation.cpp b/src/ScreenEvaluation.cpp
index a75413fb9d..6ce6976bd3 100644
--- a/src/ScreenEvaluation.cpp
+++ b/src/ScreenEvaluation.cpp
@@ -66,7 +66,6 @@ XToString( DetailLine );
 #define SHOW_SCORE_AREA				THEME->GetMetricB(m_sName,"ShowScoreArea")
 #define SHOW_TIME_AREA				THEME->GetMetricB(m_sName,"ShowTimeArea")
 #define SHOW_RECORDS_AREA			THEME->GetMetricB(m_sName,"ShowRecordsArea")
-#define MAX_COMBO_NUM_DIGITS		THEME->GetMetricI(m_sName,"MaxComboNumDigits")
 #define PLAYER_OPTIONS_HIDE_FAIL_TYPE	THEME->GetMetricB(m_sName,"PlayerOptionsHideFailType")
 #define PLAYER_OPTIONS_SEPARATOR	THEME->GetMetric (m_sName,"PlayerOptionsSeparator")
 #define CHECKPOINTS_WITH_JUDGMENTS	THEME->GetMetricB(m_sName,"CheckpointsWithJudgments")
@@ -460,6 +459,7 @@ void ScreenEvaluation::Init()
 
 	// init judgment area
 	ROLLING_NUMBERS_CLASS.Load( m_sName, "RollingNumbersClass" );
+	ROLLING_NUMBERS_MAX_COMBO_CLASS.Load( m_sName, "RollingNumbersMaxComboClass" );
 	FOREACH_ENUM( JudgmentLine, l )
 	{
 		if( l == JudgmentLine_W1  && !GAMESTATE->ShowW1() )
@@ -481,7 +481,10 @@ void ScreenEvaluation::Init()
 			{
 				m_textJudgmentLineNumber[l][p].LoadFromFont( THEME->GetPathF(m_sName, "JudgmentLineNumber") );
 				m_textJudgmentLineNumber[l][p].SetName( JudgmentLineToString(l)+ssprintf("NumberP%d",p+1) );
-				m_textJudgmentLineNumber[l][p].Load( ROLLING_NUMBERS_CLASS );
+				if( JudgmentLineToString(l) == "MaxCombo" )
+					m_textJudgmentLineNumber[l][p].Load( ROLLING_NUMBERS_MAX_COMBO_CLASS );
+				else
+					m_textJudgmentLineNumber[l][p].Load( ROLLING_NUMBERS_CLASS );
 				ActorUtil::LoadAllCommands( m_textJudgmentLineNumber[l][p], m_sName );
 				SET_XY( m_textJudgmentLineNumber[l][p] );
 				this->AddChild( &m_textJudgmentLineNumber[l][p] );
diff --git a/src/ScreenEvaluation.h b/src/ScreenEvaluation.h
index 5e14e159f1..454cb34b75 100644
--- a/src/ScreenEvaluation.h
+++ b/src/ScreenEvaluation.h
@@ -115,6 +115,7 @@ protected:
 
 	ThemeMetric<bool>	SUMMARY;
 	ThemeMetric<RString> ROLLING_NUMBERS_CLASS;
+	ThemeMetric<RString> ROLLING_NUMBERS_MAX_COMBO_CLASS;
 	/** @brief Did a player save a screenshot of their score? */
 	bool			m_bSavedScreenshot[NUM_PLAYERS];
 };
diff --git a/src/TimingData.cpp b/src/TimingData.cpp
index cb20d14022..fa4adf89d6 100644
--- a/src/TimingData.cpp
+++ b/src/TimingData.cpp
@@ -36,7 +36,7 @@ void TimingData::Clear()
 		vector<TimingSegment*> &vSegs = m_avpTimingSegments[tst];
 		for( unsigned i = 0; i < vSegs.size(); ++i )
 		{
-			LOG->Trace( "deleting %p", vSegs[i] );
+			//LOG->Trace( "deleting %p", vSegs[i] );
 			SAFE_DELETE( vSegs[i] );		}
 
 		vSegs.clear();
@@ -323,7 +323,7 @@ static void EraseSegment( vector<TimingSegment*> &vSegs, int index, TimingSegmen
 // so we must deep-copy it (with ::Copy) for new allocations.
 void TimingData::AddSegment( const TimingSegment *seg )
 {
-	LOG->Trace( "AddSegment( %s )", TimingSegmentTypeToString(seg->GetType()).c_str() );
+	//LOG->Trace( "AddSegment( %s )", TimingSegmentTypeToString(seg->GetType()).c_str() );
 	seg->DebugPrint();
 
 	TimingSegmentType tst = seg->GetType();