updates to player
merged changes