Updated standalone player
Reverted merge override