Changed one method in Player for the better