Improved game flow