Add window-number feature