edits
merge
added data for player
merge