Merged in high score code