Merge removed Player.js for some reason