updated player with popup fix
merge