merged new player code