new edits for one-stop-finder