Matthew -- reorganized player.h