Updated to switch to new Player class