tweaks to use live finders