added player
merged (I hope)