UPDATE: Had to make another change to fix freezes after hole 6 and the leaderboard... (unfortuantely had to reset the leaderboard as well, sorry)
