Minor nitpicking
Change player architecture to avoid data losses