Lobby 2.5

Fix, clear code