Added option of show/not show pop-up window