popover & singleton update