commit with working Xwin logic