Final Changes all working find in the popover