working on player display
merged