just consolodated a few of the popover things