refactoring to play in the lab and with updated game server