Added automatic player toggling