added player1/2 conditional