Added other-window-or-split