A few changes to Player