GameState added and refactoring