Cleanup and works for popover
using theirs