diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index bb93acf069..e190444ee5 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -23,6 +23,7 @@
 #include "Notes.h"
 #include "NoteSkinManager.h"
 #include "ModeChoice.h"
+#include "NoteFieldPositioning.h"
 
 
 GameState*	GAMESTATE = NULL;	// global and accessable from anywhere in our program
@@ -41,6 +42,8 @@ GameState::GameState()
 
 GameState::~GameState()
 {
+	for( int p=0; p<NUM_PLAYERS; p++ )
+		delete m_Position[p];
 }
 
 void GameState::Reset()
@@ -84,12 +87,19 @@ void GameState::Reset()
 	m_SongOptions.Init();
 	for( p=0; p<NUM_PLAYERS; p++ )
 		NOTESKIN->SwitchNoteSkin( PlayerNumber(p), PREFSMAN->m_sDefaultNoteSkin );
+
+	for( p=0; p<NUM_PLAYERS; p++ )
+		m_Position[p] = new NoteFieldPositioning;
 }
 
 void GameState::Update( float fDelta )
 {
-	for( int p=0; p<NUM_PLAYERS; p++ )
+	int p;
+	for( p=0; p<NUM_PLAYERS; p++ )
 		m_CurrentPlayerOptions[p].Approach( m_PlayerOptions[p], fDelta );
+
+	for( p=0; p<NUM_PLAYERS; p++ )
+		if(m_Position[p]) m_Position[p]->Update(fDelta);
 }
 
 
diff --git a/stepmania/src/GameState.h b/stepmania/src/GameState.h
index 2a8720f7d5..dd7d74cab3 100644
--- a/stepmania/src/GameState.h
+++ b/stepmania/src/GameState.h
@@ -25,6 +25,7 @@ class Course;
 class GameDef;
 class StyleDef;
 struct ModeChoice;
+class NoteFieldPositioning;
 
 
 class GameState
@@ -150,6 +151,11 @@ public:
 	RankingCategory		m_RankingCategory[NUM_PLAYERS];	// meaningless if a course was played
 	Course*				m_pRankingCourse;		// meaningless unless Course was played
 	int					m_iRankingIndex[NUM_PLAYERS];		// -1 if no new high score
+
+	//
+	// Arrow positioning
+	//
+	NoteFieldPositioning *m_Position[NUM_PLAYERS];
 };