Improve wonwindow feature