Added window watcher