Working on popover version