try to modify to use new window.