added new player and combined shit with some changes