Changed the state management
Merge branch 'gamestage'