added some changes for unworked popover