modified Player
Merge