Matthew -- added xwindow field to player