added renumbering of windows