xwin stuff added