Added window-numbering mode