refactor finders for the progress