Updated Version with Lobby