A few changes to player