changed vars
Merge branch 'Player'