diff --git a/app.js b/app.js
index 103e832..d8c8fbf 100644
--- a/app.js
+++ b/app.js
@@ -44,11 +44,14 @@ io.on("connection", socket => {
 				}
 			}
 		}
-		console.log('new-game data.gameId=', data.gameId);
 		socket.join(data.gameId)
-		console.log('allGames=', allGames);
-		console.log('this games players=', allGames[data.gameId].players);
-		io.to(data.gameId).emit('player-joined', data, allGames[data.gameId])
+		var userSpecificData = {
+			username: data.username,
+			role: 'picker',
+			gameId: data.gameId,
+			gameInfo: allGames[data.gameId]
+		}
+		io.to(socket.id).emit('set-user-info', userSpecificData)
 	})
 
 	socket.on('join-game', function(data) {
@@ -58,13 +61,15 @@ io.on("connection", socket => {
 			score: 0,
 			currentRole: 'player'
 		}
-		console.log('allGames=', allGames);
-		console.log('this games players=', allGames[data.gameId].players);
-
-		console.log("join-game data.gameId=", data.gameId);
 		socket.join(data.gameId)
-				console.log("io.sockets.adapter.rooms=", io.sockets.adapter.rooms);
-		io.to(data.gameId).emit('player-joined', data, allGames[data.gameId]) // loop through players in that game & emit to only them
+		var userSpecificData = {
+			username: data.username,
+			role: 'player',
+			gameId: gameId
+		}
+		io.to(socket.id).emit('set-user-info', userSpecificData)
+		io.to(data.gameId).emit('player-joined', allGames[gameId])
+		console.log("io.sockets.adapter.rooms=", io.sockets.adapter.rooms);
 	})
 
 });