added new player and combined shit